Merge pull request #225 from Aviuz/1.2.3

1.2.3

About/About.xml

@@ -23,7 +23,7 @@
 	</li>
 	</modDependencies>
 
-	<description>Version 1.2.2
+	<description>Version 1.2.3
 
 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.

Defs/ThinkTreeDef.xml

@@ -12,7 +12,13 @@
               <li Class="JobGiver_SeekSafeTemperature"/>
             </subNodes>
           </li>
-      		<li Class="ThinkNode_Priority">
+           <li Class="ThinkNode_Tagger">
+              <tagToGive>ChangingApparel</tagToGive>
+              <subNodes>
+                <li Class="JobGiver_PrisonerGetDressed" />
+              </subNodes>
+           </li>
+      	   <li Class="ThinkNode_Priority">
       			<subNodes>
               <li Class="PrisonLabor.Core.AI.JobGivers.JobGiver_BedTime" />
               <li Class="PrisonLabor.Core.AI.JobGivers.JobGiver_PickupWeapon" />

Languages/English/Keyed/Keys.xml

@@ -91,4 +91,7 @@
 
   <PrisonLabor_ToggleHandscuffs>Remove/put handcuffs</PrisonLabor_ToggleHandscuffs>
   <PrisonLabor_ToggleLegscuffs>Remove/put legscuffs</PrisonLabor_ToggleLegscuffs>
+
+  <PrisonLabor_EnableDebugLogs>Enable Debug Logs</PrisonLabor_EnableDebugLogs>
+  <PrisonLabor_EnableDebugLogsDesc>Turning on this option may spam log</PrisonLabor_EnableDebugLogsDesc>
 </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.2.2-orange.svg?style=flat" alt="v1.2.2" />
+    <img src="https://img.shields.io/badge/version-1.2.3-orange.svg?style=flat" alt="v1.2.3" />
   </a>
 </p>
 

Source/CompatibilityPatches/Initialization.cs

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

Source/CompatibilityPatches/Kajin2.cs

@@ -0,0 +1,64 @@
+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 Kajin2
+    {
+        private static ModSearcher modSeeker;
+        internal static void Init()
+        {
+            ModSearcher modSeeker = new ModSearcher("Kijin Race 2.0");
+            if (modSeeker.LookForMod())
+            {
+                Patch();
+            }
+        }
+
+        private static void Patch()
+        {
+            try
+            {
+                MethodBase methodBase = getTargetMethod();
+                if (methodBase != null)
+                {
+                    var harmony = new Harmony("Harmony_PrisonLabor_Kajin2");
+                    harmony.Patch(methodBase, postfix: new HarmonyMethod(typeof(Kajin2).GetMethod("postfix_Job")));
+                }
+            }
+            catch (Exception e)
+            {
+                Log.Error($"PrisonLaborException: failed to proceed Kijin Race 2.0 mod patches: {e.ToString()}");
+            }
+
+        }
+
+        public static Pawn postfix_Job( Pawn __result, IntVec3 c, Map map)
+        {
+            if (__result == null)
+            {
+                foreach(Thing thing in GridsUtility.GetThingList(c, map) )
+                {
+                    Pawn val = thing as Pawn;
+                    if (val != null && !val.Dead && !val.Downed && val.IsPrisonerOfColony)
+                    {
+                        return val;
+                    }
+                }
+            }
+            return __result;
+        }
+        private static MethodBase getTargetMethod()
+        {
+            return AccessTools.Method("Kijin2.Kijin2PlantCollectedPatch:GetFirstPawnNotDeadOrDowned");
+        }
+    }
+}

Source/Core/AI/JobGivers/JobGiver_BedTime.cs

@@ -19,6 +19,10 @@ public override ThinkNode DeepCopy(bool resolve = true)
 
         public override float GetPriority(Pawn pawn)
         {
+            if (pawn.needs.rest == null)
+            {
+                return 0f;
+            }
             if (HealthAIUtility.ShouldHaveSurgeryDoneNow(pawn))
                 return 15f;
             if (pawn.timetable != null && pawn.timetable.CurrentAssignment == TimeAssignmentDefOf.Sleep)
@@ -28,6 +32,10 @@ public override float GetPriority(Pawn pawn)
 
         protected override Job TryGiveJob(Pawn pawn)
         {
+            if(pawn.needs.rest == null)
+            {
+                return null;
+            }
             if (pawn.timetable == null || pawn.timetable.CurrentAssignment != TimeAssignmentDefOf.Sleep)
                 return null;
             if (RestUtility.DisturbancePreventsLyingDown(pawn))

Source/Core/Incidents/IncidentWorker_ResocializationOffer.cs

@@ -18,7 +18,7 @@ protected override bool CanFireNowSub(IncidentParms parms)
 
             foreach (var pawn in map.mapPawns.PrisonersOfColony)
             {
-                if (pawn.IsColonist)
+                if (pawn.IsColonist || !pawn.Spawned)
                     continue;
 
                 var treatment = pawn.needs.TryGetNeed<Need_Treatment>();
@@ -39,7 +39,7 @@ protected override bool TryExecuteWorker(IncidentParms parms)
             var affectedPawns = new List<Pawn>(map.mapPawns.PrisonersOfColony);
             foreach (var pawn in map.mapPawns.PrisonersOfColony)
             {
-                if (pawn.IsColonist)
+                if (pawn.IsColonist || !pawn.Spawned)
                     continue;
 
                 var treatment = pawn.needs.TryGetNeed<Need_Treatment>();
@@ -58,8 +58,14 @@ protected override bool TryExecuteWorker(IncidentParms parms)
                 return false;
 
             Tutorials.Treatment();
-
-            SendStandardLetter(parms, prisoner, prisoner.Name.ToStringShort, prisoner.Faction.Name);
+            if (prisoner.Faction == null)
+            {
+                SendStandardLetter(parms, prisoner, prisoner.Name.ToStringShort);
+            }
+            else
+            {
+                SendStandardLetter(parms, prisoner, prisoner.Name.ToStringShort, prisoner.Faction.Name);
+            }
             return true;
         }
     }

Source/Core/Incidents/IncidentWorker_Suicide.cs

@@ -21,7 +21,7 @@ protected override bool CanFireNowSub(IncidentParms parms)
 
             foreach (var pawn in map.mapPawns.PrisonersOfColony)
             {
-                if (pawn.IsColonist || pawn.health.capacities.GetLevel(PawnCapacityDefOf.Manipulation) == 0f || pawn.health.capacities.GetLevel(PawnCapacityDefOf.Consciousness) == 0f)
+                if (pawn.IsColonist || !pawn.Spawned || pawn.health.capacities.GetLevel(PawnCapacityDefOf.Manipulation) == 0f || pawn.health.capacities.GetLevel(PawnCapacityDefOf.Consciousness) == 0f)
                 {
                     continue;
                 }
@@ -42,7 +42,7 @@ protected override bool TryExecuteWorker(IncidentParms parms)
             var affectedPawns = new List<Pawn>(map.mapPawns.PrisonersOfColony);
             foreach (var pawn in map.mapPawns.PrisonersOfColony)
             {
-                if (pawn.IsColonist)
+                if (pawn.IsColonist || !pawn.Spawned || pawn.health.capacities.GetLevel(PawnCapacityDefOf.Manipulation) == 0f || pawn.health.capacities.GetLevel(PawnCapacityDefOf.Consciousness) == 0f)
                     continue;
 
                 var need = pawn.needs.TryGetNeed<Need_Treatment>();

Source/Core/Meta/Prefs.cs

@@ -15,6 +15,18 @@ public static class PrisonLaborPrefs
         private static readonly string prefsFilePath =
             Path.Combine(GenFilePaths.ConfigFolderPath, "PrisonLabor_Prefs.xml");
 
+        public static bool DebugLogs
+        {
+            get
+            {
+                return data.enable_debug_logging;
+            }
+            set
+            {
+                data.enable_debug_logging = value;
+                Apply();
+            }
+        }
         public static Version Version
         {
             get { return data.version; }
@@ -209,6 +221,7 @@ public static void RestoreToDefault()
             data.version = version;
             data.last_version = last_version;
             data.tutorials_flags = tutorials;
+            data.enable_debug_logging = false;
 
             Apply();
         }

Source/Core/Meta/PrefsData.cs

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

Source/Core/Meta/Version.cs

@@ -64,6 +64,7 @@ public enum Version
         v1_1_11,
         v1_2_0,
         v1_2_1,
-        v1_2_2
+        v1_2_2,
+        v1_2_3
     }
 }

Source/Core/Meta/VersionUtility.cs

@@ -5,8 +5,8 @@ namespace PrisonLabor.Core.Meta
 {
     class VersionUtility
     {
-        public const Version versionNumber = Version.v1_2_2;
-        public const string versionString = "1.2.2";
+        public const Version versionNumber = Version.v1_2_3;
+        public const string versionString = "1.2.3";
 
         public static Version VersionOfSaveFile { get; set; }
 

Source/Core/Needs/Need_Motivation.cs

@@ -85,7 +85,11 @@ private float GetChangePoints()
                             value -= BGP.Laziness_LazyRate;
                             if (HealthAIUtility.ShouldSeekMedicalRest(pawn))
                                 value -= BGP.Laziness_HealthRate;
-                            value -= (int)pawn.needs.food.CurCategory * BGP.Laziness_HungryRate;
+                            if (pawn.needs.food != null)
+                            {
+                                //warforged
+                                value -= (int)pawn.needs.food.CurCategory * BGP.Laziness_HungryRate;
+                            }
                             // Some pawns have no rest need (e.g. Pawns with Circadian Half Cycler or androids from other mods)
                             if (pawn.needs.rest != null)
                             {

Source/Core/Needs/Need_Treatment.cs

@@ -85,18 +85,21 @@ public override void NeedInterval()
                 CurLevel += BGP.JoyRate;
 
             // Status
-            var hunger = pawn.needs.TryGetNeed<Need_Food>();
-
-            int statusScore = 0;
-            if (hunger.CurCategory < HungerCategory.UrgentlyHungry)
-                statusScore += 5;
-            if (hunger.CurCategory < HungerCategory.Hungry)
-                statusScore += 5;
-            statusScore -= (int)pawn.health.hediffSet.PainTotal / 10;
-            if (pawn.health.HasHediffsNeedingTend())
-                statusScore -= 7;
-
-            CurLevel += statusScore * BGP.StatusMultiplier;
+            if (pawn.needs.food != null)
+            {
+                var hunger = pawn.needs.TryGetNeed<Need_Food>();
+
+                int statusScore = 0;
+                if (hunger.CurCategory < HungerCategory.UrgentlyHungry)
+                    statusScore += 5;
+                if (hunger.CurCategory < HungerCategory.Hungry)
+                    statusScore += 5;
+                statusScore -= (int)pawn.health.hediffSet.PainTotal / 10;
+                if (pawn.health.HasHediffsNeedingTend())
+                    statusScore -= 7;
+
+                CurLevel += statusScore * BGP.StatusMultiplier;
+            }
 
 
             // Labor

Source/Core/Other/CleanPrisonersStatus.cs

@@ -0,0 +1,31 @@
+using PrisonLabor.Constants;
+using RimWorld;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+
+namespace PrisonLabor.Core.Other
+{
+    public static class CleanPrisonersStatus
+    {
+
+        static public void Clean(Pawn prisoner)
+        {
+            prisoner.workSettings = new Pawn_WorkSettings(prisoner);
+            Hediff legs = prisoner.health.hediffSet.GetFirstHediffOfDef(PL_DefOf.PrisonLabor_RemovedLegscuffs, false);
+            if (legs != null)
+            {
+                prisoner.health.hediffSet.hediffs.Remove(legs);
+            }
+            Hediff hands = prisoner.health.hediffSet.GetFirstHediffOfDef(PL_DefOf.PrisonLabor_RemovedHandscuffs, false);
+            if (hands != null)
+            {
+                prisoner.health.hediffSet.hediffs.Remove(hands);
+            }
+            prisoner.playerSettings.AreaRestriction = null;
+        }
+    }
+}