Merge pull request #237 from Aviuz/1.3.1

1.3.1

1.3/Defs/MainButton.xml

@@ -5,6 +5,7 @@
     <label>Prisoners</label>
     <description>Manage your faction prisoners</description>
     <tabWindowClass>PrisonLabor.Core.MainButton_Window.PrisonerButtonWindow</tabWindowClass>
+    <iconPath>PL_TabIcon</iconPath>
     <order>35</order>
     <closesWorldView>true</closesWorldView>
   </MainButtonDef>

1.3/Defs/PrisonerInteractionModeDef.xml

@@ -10,9 +10,4 @@
     <label>Work and recruit</label>
     <listOrder>6</listOrder>
   </PrisonerInteractionModeDef>
-  <PrisonerInteractionModeDef>
-    <defName>PrisonLabor_workAndConvertOption</defName>
-    <label>Work and convert</label>
-    <listOrder>7</listOrder>
-  </PrisonerInteractionModeDef>
 </Defs>

1.3/Defs/WorkGiverDef.xml

@@ -19,8 +19,8 @@
         <giverClass>PrisonLabor.Core.AI.WorkGivers.WorkGiver_HandleChains</giverClass>
         <workType>PrisonLabor_Jailor</workType>
         <priorityInType>5</priorityInType>
-        <verb>>handle prisoner's chainsr</verb>
-        <gerund>>handling prisoner's chains</gerund>
+        <verb>handle prisoner's chains</verb>
+        <gerund>handling prisoner's chains</gerund>
         <requiredCapacities>
             <li>Manipulation</li>
         </requiredCapacities>

Ideology/Defs/PrisonersInteractionMode.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+  <PrisonerInteractionModeDef>
+    <defName>PrisonLabor_workAndConvertOption</defName>
+    <label>Work and convert</label>
+    <listOrder>7</listOrder>
+  </PrisonerInteractionModeDef>
+
+  <PrisonerInteractionModeDef>
+    <defName>PrisonLabor_workAndEnslaveOption</defName>
+    <label>Work and enslave</label>
+    <listOrder>8</listOrder>
+  </PrisonerInteractionModeDef>
+
+</Defs>

Languages/English/Keyed/Keys.xml

@@ -3,6 +3,7 @@
   <PrisonLabor_PrisonerWork>Force to work</PrisonLabor_PrisonerWork>
   <PrisonLabor_WorkAndRecruit>Work and recruit</PrisonLabor_WorkAndRecruit>
   <PrisonLabor_WorkAndConvert>Work and convert</PrisonLabor_WorkAndConvert>
+  <PrisonLabor_WorkAndEnslave>Work and enslave</PrisonLabor_WorkAndEnslave>
   <PrisonLabor_LazyPrisonerMessage>Your prisoner stopped working!</PrisonLabor_LazyPrisonerMessage>
   <PrisonLabor_WardenResponseThreshold>Warden response threshold</PrisonLabor_WardenResponseThreshold>
   <PrisonLabor_StoppingWorkThreshold>Stopping work threshold</PrisonLabor_StoppingWorkThreshold>

LoadFolders.xml

@@ -14,5 +14,6 @@
   <v1.3>
     <li>/</li>
     <li>1.3</li>
+    <li IfModActive="Ludeon.Rimworld.Ideology">Ideology</li>
   </v1.3>
 </loadFolders>

MakeRelease.bat

@@ -39,10 +39,12 @@ xcopy "1.1\*.*" "%target_directory%\1.1" /e
 mkdir "%target_directory%\1.2"
 xcopy "1.2\*.*" "%target_directory%\1.2" /e
 
-:: 1.2
+:: 1.3
 mkdir "%target_directory%\1.3"
 xcopy "1.3\*.*" "%target_directory%\1.3" /e
 
+mkdir "%target_directory%\Ideology"
+xcopy "Ideology\*.*" "%target_directory%\Ideology" /e
 
 :: LoadFolders.xml
 copy "LoadFolders.xml" "%target_directory%\LoadFolders.xml"

Source/Constants/PL_DefOf.cs

@@ -12,8 +12,13 @@ public static class PL_DefOf
     {
         public static PrisonerInteractionModeDef PrisonLabor_workOption;
         public static PrisonerInteractionModeDef PrisonLabor_workAndRecruitOption;
+
+        [MayRequireIdeology]
         public static PrisonerInteractionModeDef PrisonLabor_workAndConvertOption;
 
+        [MayRequireIdeology]
+        public static PrisonerInteractionModeDef PrisonLabor_workAndEnslaveOption;
+
         public static WorkTypeDef PrisonLabor_Jailor;
 
         public static NeedDef PrisonLabor_Motivation;

Source/Core/AI/ThinkNodes/ThinkNode_Labor.cs

@@ -1,3 +1,4 @@
+using PrisonLabor.Core.Components;
 using PrisonLabor.Core.Needs;
 using PrisonLabor.Core.Other;
 using PrisonLabor.Core.Trackers;
@@ -32,17 +33,18 @@ protected override bool Satisfied(Pawn pawn)
 
                 // Prisoner will escape if get ready to run.
                 // If he can run he will start ticking impatient, once complete he will get ready.
-                var escapeTracker = EscapeTracker.Of(pawn, true);
+
+                var prisonerComp = pawn.TryGetComp<PrisonerComp>();
                 if (pawn.guest.PrisonerIsSecure && RCellFinder.TryFindBestExitSpot(pawn, out c, TraverseMode.ByPawn))
                 {
-                    if (escapeTracker.ReadyToEscape)
+                    if (prisonerComp.escapeTracker.ReadyToEscape)
                         return false;
                     else
-                        escapeTracker.CanEscape = true;
+                        prisonerComp.escapeTracker.CanEscape = true;
                 }
                 else
                 {
-                    escapeTracker.CanEscape = false;
+                    prisonerComp.escapeTracker.CanEscape = false;
                 }
 
 

Source/Core/AI/WorkGivers/WorkGiver_Supervise.cs

@@ -1,3 +1,4 @@
+using PrisonLabor.Core.Components;
 using PrisonLabor.Core.Needs;
 using PrisonLabor.Core.Trackers;
 using RimWorld;
@@ -20,14 +21,17 @@ public override Job JobOnThing(Pawn pawn, Thing t, bool forced = false)
                 return null;
             if (pawn.IsPrisoner)
                 return null;
-            var escapeTracker = EscapeTracker.Of(prisoner, true);
-            if (!PrisonLaborUtility.LaborEnabled(prisoner) && !escapeTracker.CanEscape)
+            var prisonerComp = prisoner.TryGetComp<PrisonerComp>(); ;
+
+            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.WorkTime(prisoner) || !need.ShouldBeMotivated) && !escapeTracker.CanEscape)
+            if (PrisonLaborUtility.EnslaveInLaborEnabled(prisoner))
+                return new Job(JobDefOf.PrisonerEnslave, t);
+            if ((!PrisonLaborUtility.WorkTime(prisoner) || !need.ShouldBeMotivated) && prisonerComp != null && !prisonerComp.escapeTracker.CanEscape)
                 return null;
 
             return new Job(DefDatabase<JobDef>.GetNamed("PrisonLabor_PrisonerSupervise"), prisoner);

Source/Core/Alerts/Alert_EscapingPrisoners.cs

@@ -23,10 +23,7 @@ private IEnumerable<Pawn> PotentialEscapingPrisoners
         {
             get
             {
-                var maps = Find.Maps;
-                for (var i = 0; i < maps.Count; i++)
-                    foreach (var pawn in maps[i].mapPawns.AllPawns.Where(p=>p.IsPrisoner && EscapeTracker.Of(p, true).CanEscape))
-                            yield return pawn;
+                return EscapeTracker.PrisonersReadyToEscape;
             }
         }
 

Source/Core/BaseClasses/SimpleTimer.cs

@@ -32,7 +32,7 @@ public void Tick()
         {
             if (_IsActive)
             {
-                Ticks++;
+                Ticks += 250; 
             }
         }
 

Source/Core/Components/PrisonerComp.cs

@@ -13,8 +13,10 @@
 namespace PrisonLabor.Core.Components
 {
 
-   public class PrisonerComp : ThingComp
+    public class PrisonerComp : ThingComp
     {
+        public EscapeTracker escapeTracker;
+
         private bool Active
         {
             get
@@ -24,6 +26,14 @@ private bool Active
             }
         }
 
+        public override void Initialize(CompProperties props)
+        {
+            base.Initialize(props);
+            if (escapeTracker == null)
+            {
+                escapeTracker = new EscapeTracker(this.parent as Pawn);
+            }
+        }
         public override void PostDraw()
         {
             if (Active && PrisonLaborPrefs.EnableMotivationIcons)
@@ -43,10 +53,11 @@ public override void PostDraw()
                     DrawIcon(TexturePool.lazyTexture);
                 }
             }
-            
+
         }
 
 
+
         private void DrawIcon(Material drawIcon)
         {
             var drawPos = parent.DrawPos;
@@ -62,5 +73,18 @@ private void DrawIcon(Material drawIcon)
             var material = FadedMaterialPool.FadedVersionOf(drawIcon, num2);
             Graphics.DrawMesh(MeshPool.plane05, drawPos, Quaternion.identity, material, 0);
         }
+
+        public override void PostExposeData()
+        {
+            Scribe_Deep.Look(ref escapeTracker, "EscapeTracker", new object[] { this.parent as Pawn });
+        }
+
+        public override void CompTickRare()
+        {
+            if (Active)
+            {
+                escapeTracker?.Tick();
+            }
+        }
     }
 }

Source/Core/GameSaves/SaveCleaner.cs

@@ -163,7 +163,7 @@ private static void UpdateData(XmlElement xmlNode)
             // TODO bills
 
             // Interaction Mode
-            string[] interactions = { PL_DefOf.PrisonLabor_workOption.defName, PL_DefOf.PrisonLabor_workAndRecruitOption.defName, PL_DefOf.PrisonLabor_workAndConvertOption.defName };
+            string[] interactions = { PL_DefOf.PrisonLabor_workOption.defName, PL_DefOf.PrisonLabor_workAndRecruitOption.defName, PL_DefOf.PrisonLabor_workAndConvertOption.defName, PL_DefOf.PrisonLabor_workAndEnslaveOption.defName };
 
             foreach (var guestTracker in gameNode.GetEveryNode("guest"))
             {

Source/Core/MainButton_Window/ColumnWorker_EscapeTracker.cs

@@ -1,4 +1,5 @@
-using PrisonLabor.Core.Trackers;
+using PrisonLabor.Core.Components;
+using PrisonLabor.Core.Trackers;
 using RimWorld;
 using System;
 using System.Collections.Generic;
@@ -13,24 +14,23 @@ public class ColumnWorker_EscapeTracker : PawnColumnWorker_Text
     {
         protected override string GetTextFor(Pawn pawn)
         {
-
-            var escapeTracker = EscapeTracker.Of(pawn);
-            if(escapeTracker != null)
+            var prisonerComp = pawn.TryGetComp<PrisonerComp>();
+            if(prisonerComp != null)
             {
-                return (escapeTracker.ReadyToEscape ? "ready" : escapeTracker.ReadyToRunPercentage + " %");
+                return (prisonerComp.escapeTracker.ReadyToEscape ? "ready" : prisonerComp.escapeTracker.ReadyToRunPercentage + " %");
             }
 
-            return "0 %";
+            return null;
         }
 
         protected override string GetTip(Pawn pawn)
         {
-            var escapeTracker = EscapeTracker.Of(pawn);
-            if (escapeTracker != null)
+            var prisonerComp = pawn.TryGetComp<PrisonerComp>();
+            if (prisonerComp != null)
             {
-                return $"(Cap:{ escapeTracker.EscapeLevel})";
+                return $"(Cap:{ prisonerComp.escapeTracker.EscapeLevel})";
             }
-            return "";
+            return null;
         }
     }
 }

Source/Core/MainButton_Window/ColumnWorker_HasHandscuffs.cs

@@ -38,5 +38,10 @@ protected override void SetValue(Pawn pawn, bool value, PawnTable table)
             }
             table.SetDirty();
         }
+
+        protected override bool HasCheckbox(Pawn pawn)
+        {
+            return pawn != null && pawn.health != null;
+        }
     }
 }

Source/Core/MainButton_Window/ColumnWorker_HasLegcuffs.cs

@@ -38,5 +38,10 @@ protected override void SetValue(Pawn pawn, bool value, PawnTable table)
             }
             table.SetDirty();
         }
+
+        protected override bool HasCheckbox(Pawn pawn)
+        {
+            return pawn != null && pawn.health != null;
+        }
     }
 }

Source/Core/MainButton_Window/ColumnWorker_Interaction.cs

@@ -1,4 +1,5 @@
-using RimWorld;
+using PrisonLabor.Constants;
+using RimWorld;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -30,6 +31,10 @@ public override void DoCell(Rect rect, Pawn pawn, PawnTable table)
                     option = new FloatMenuOption(intertaction.LabelCap, delegate
                     {
                         pawn.guest.interactionMode = intertaction;
+                        if(intertaction == PrisonerInteractionModeDefOf.Convert || intertaction == PL_DefOf.PrisonLabor_workAndConvertOption)
+                        {
+                            pawn.guest.ideoForConversion = Faction.OfPlayer.ideos.PrimaryIdeo;
+                        }
                     }),
                     payload = intertaction
                 };

Source/Core/MainButton_Window/CustomTabWindow.cs

@@ -54,7 +54,7 @@ public override Vector2 InitialSize
 				return requestedTabSize;
 			}
 		}
-		protected virtual IEnumerable<Pawn> Pawns => Find.CurrentMap.mapPawns.FreeColonists_NoHusks;
+		protected virtual IEnumerable<Pawn> Pawns => Find.CurrentMap.mapPawns.FreeColonists;
 
 		public override void PostOpen()
 		{

Source/Core/MainButton_Window/PrisonerButtonWindow.cs

@@ -84,6 +84,7 @@ public PrisonerButtonWindow() : base()
         {
            foreach(var def in DefDatabase<PrisonersTabDef>.AllDefs)
            {
+                Log.Message($"Def: {def.defName}, def.dev: {def.dev}, dev: {Prefs.DevMode}");
                 if(def.dev == false)
                 {
                     tabsView.Add(def, CreateWindow(def));
@@ -94,9 +95,9 @@ public PrisonerButtonWindow() : base()
                 }
 
             }
-           DebugLogger.debug("Prisoners main windows constructed");
-
+           DebugLogger.debug("Prisoners main windows constructed");            
         }
+
         public override void DoWindowContents(Rect inRect)
         {           
 
@@ -113,15 +114,16 @@ public override void PostOpen()
         {
             base.PostOpen();
             tabs.Clear();
-            foreach (PrisonersTabDef tabDef in DefDatabase<PrisonersTabDef>.AllDefs.OrderBy(def => def.order))
+            foreach (PrisonersTabDef tabDef in DefDatabase<PrisonersTabDef>.AllDefs.Where(def => !def.dev || def.dev == Prefs.DevMode).OrderBy(def => def.order))
             {                
                 tabs.Add(new PrisonerWindowTab(tabDef, tabDef.LabelCap, delegate
                 {
                     CurTab = tabDef;
                 }, () => CurTab == tabDef));
                 GetTable(tabDef);
+
             }
-            CurTab = tabs[0].def;
+            CurTab = tabs[1].def;
             foreach(var tab in tabsView.Values)
             {
                 tab.PostOpen();

Source/Core/Needs/Need_Treatment.cs

@@ -106,6 +106,7 @@ public override void NeedInterval()
             var motivation = pawn.needs.TryGetNeed<Need_Motivation>();
             if (motivation != null && motivation.IsPrisonerWorking)
                 CurLevel += BGP.LaborRate;
+
         }
 
         public override string GetTipString()

Source/Core/PrisonLaborUtility.cs

@@ -14,8 +14,11 @@ internal static class PrisonLaborUtility
         public static bool LaborEnabled(this Pawn pawn)
         {
             if (pawn.IsPrisoner)
-                if (pawn.guest.interactionMode == PL_DefOf.PrisonLabor_workOption || pawn.guest.interactionMode == PL_DefOf.PrisonLabor_workAndRecruitOption || pawn.guest.interactionMode == PL_DefOf.PrisonLabor_workAndConvertOption)
+                if (pawn.guest.interactionMode == PL_DefOf.PrisonLabor_workOption || pawn.guest.interactionMode == PL_DefOf.PrisonLabor_workAndRecruitOption
+                    || pawn.guest.interactionMode == PL_DefOf.PrisonLabor_workAndConvertOption || pawn.guest.interactionMode == PL_DefOf.PrisonLabor_workAndEnslaveOption)
+                {
                     return true;
+                }
 
             return false;
         }
@@ -36,10 +39,15 @@ public static bool ConvertInLaborEnabled(Pawn pawn)
             return false;
         }
 
+        public static bool EnslaveInLaborEnabled(Pawn pawn)
+        {
+            if (pawn.guest.interactionMode == PL_DefOf.PrisonLabor_workAndEnslaveOption && pawn.guest.ScheduledForInteraction && pawn.health.capacities.CapableOf(PawnCapacityDefOf.Talking))
+                return true;
+
+            return false;
+        }
         public static bool WorkTime(Pawn pawn)
         {
-/*            if (pawn.needs == null || pawn.needs.food == null || pawn.needs.rest == null)
-                return false;*/
             if (pawn.timetable == null)
                 return true;
             if (pawn.timetable.CurrentAssignment == TimeAssignmentDefOf.Work)