Merge pull request #11 from FluffierThanThou/A14

fix issues introduced in last commit, add proper priority communicati…

Author: FluffierThanThou

About/About.xml

@@ -3,7 +3,7 @@
 	<name>Work Tab</name>
 	<author>Fluffy</author>
 	<url>https://ludeon.com/forums/index.php?topic=15964.0</url>
-	<targetVersion>0.14.1234</targetVersion>
+	<targetVersion>0.14.1241</targetVersion>
 	<description>&lt;size=36&gt;REQUIRES CCL&lt;/size&gt;
 
 &lt;b&gt;Description&lt;/b&gt;  	

Assemblies/Fluffy_Tabs.dll

@@ -33,7 +33,7 @@ public class Detours_WorkSettings : Pawn_WorkSettings
         public int _GetPriority( WorkTypeDef w )
         {
             Pawn pawn = pawnField.GetValue( this ) as Pawn;
-            return pawn.Priorities().GetPriority( w );
+            return pawn.Priorities()?.GetPriority( w ) ?? 0; // return 0 if no tracker was found
         }
 
         /// <summary>
@@ -46,7 +46,40 @@ public int _GetPriority( WorkTypeDef w )
         public void _SetPriority( WorkTypeDef w, int priority )
         {
             Pawn pawn = pawnField.GetValue( this ) as Pawn;
-            pawn.Priorities().SetPriority( w, priority );
+            
+
+            // set priority in work tab's priority list
+            if (pawn.Priorities() != null)
+                pawn.Priorities().SetPriority( w, priority );
+            // if not available, make sure that changes ARE propagated to vanilla
+            else
+                SetVanillaPriority( pawn, w, priority );
+        }
+
+        internal static void SetVanillaPriority( Pawn pawn, WorkTypeDef workTypeDef, int priority )
+        {
+            // get value
+            DefMap<WorkTypeDef, int> priorities = GetVanillaPriorities( pawn );
+
+            // cop out on issues
+            if ( priorities == null )
+            {
+                Log.Warning( "Vanilla priorities for " + pawn.LabelShort + " not found." );
+                return;
+            }
+
+            // update
+            priorities[workTypeDef] = priority;
+
+            // write back TODO: figure out if this is needed, or if we're modifying by reference (which I suspect is the case).
+            prioritiesField.SetValue( pawn, priorities );
+        }
+
+        internal static DefMap<WorkTypeDef, int> GetVanillaPriorities( Pawn pawn )
+        {
+            if ( pawn?.workSettings == null )
+                return null;
+            return prioritiesField.GetValue( pawn.workSettings ) as DefMap<WorkTypeDef, int>;
         }
 
         /// <summary>

Source/Fluffy_Tabs/.vs/Fluffy_Tabs/v14/.suo

@@ -30,6 +30,10 @@ public static MapComponent_Priorities Instance
         {
             get
             {
+                // return null if called too damn early
+                if ( Find.Map == null )
+                    return null;
+
                 // try to get from game list.
                 if ( _instance == null )
                     _instance = Find.Map.components.FirstOrDefault( comp => comp is MapComponent_Priorities ) as MapComponent_Priorities;

Source/Fluffy_Tabs/Work/Detours_WorkSettings.cs

@@ -38,39 +38,26 @@ public PawnPrioritiesTracker( Pawn pawn )
 
         private void InitPriorityCache()
         {
-            // create list of work priorities, and initialize with default settings (logic lifted from Pawn_WorkSettings.EnableAndInitialize() )
+            // initialize from vanilla priorities.
+            var vanillaPriorities = Detours_WorkSettings.GetVanillaPriorities( pawn );
+
+            // loop over hours
             for ( int hour = 0; hour < GenDate.HoursPerDay; hour++ )
             {
-                priorities.Add( new DefMap<WorkGiverDef, int>() );
-
-                // for up to six 'best' worktypes, enable
-                int count = 1;
-                foreach ( var worktype in DefDatabase<WorkTypeDef>
-                    .AllDefsListForReading
-                    .Where( wtd => !wtd.alwaysStartActive && !pawn.story.WorkTypeIsDisabled( wtd ) )
-                    .OrderByDescending( wtd => pawn.skills.AverageOfRelevantSkillsFor( wtd ) ) )
-                {
-                    foreach ( var workgiver in worktype.workGiversByPriority )
-                        priorities[hour][workgiver] = 3;
 
-                    if ( count++ > 6 )
-                        break;
-                }
+                // create map for this hour
+                priorities.Add( new DefMap<WorkGiverDef, int>() );
 
-                // enable all always enabled types
-                foreach ( var worktype in DefDatabase<WorkTypeDef>.AllDefsListForReading.Where( wtd => wtd.alwaysStartActive ) )
+                // loop over worktypes
+                foreach ( WorkTypeDef worktype in DefDatabase<WorkTypeDef>.AllDefsListForReading )
                 {
-                    foreach ( var workgiver in worktype.workGiversByPriority )
-                        priorities[hour][workgiver] = 3;
-                }
+                    int priority = vanillaPriorities[worktype];
 
-                // disable story-disabled types
-                foreach (
-                    var worktype in
-                        DefDatabase<WorkTypeDef>.AllDefsListForReading.Where( wtd => pawn.story.WorkTypeIsDisabled( wtd ) ) )
-                {
-                    foreach ( var workgiver in worktype.workGiversByPriority )
-                        priorities[hour][workgiver] = 0;
+                    // loop over workgivers in type
+                    foreach ( WorkGiverDef workgiver in worktype.workGiversByPriority )
+                    {
+                        priorities[hour][workgiver] = priority;
+                    }
                 }
             }
 
@@ -244,6 +231,9 @@ public void SetPriority( WorkGiverDef workgiver, int priority )
 
         public void SetPriority( WorkTypeDef worktype, int priority )
         {
+            // propagate to vanilla
+            Detours_WorkSettings.SetVanillaPriority( pawn, worktype, priority );
+
             foreach ( var workgiver in worktype.workGiversByPriority )
                 SetPriority( workgiver, priority );
         }

Source/Fluffy_Tabs/Work/MapComponent_PawnPriorities.cs

@@ -742,7 +742,7 @@ public static TipSignal TipForPawnWorker( Pawn pawn, WorkTypeDef worktype )
 
         public static PawnPrioritiesTracker Priorities( this Pawn pawn )
         {
-            return MapComponent_Priorities.Instance.WorkgiverTracker( pawn );
+            return MapComponent_Priorities.Instance?.WorkgiverTracker( pawn );
         }
 
         private static bool CapableOf( this Pawn pawn, WorkGiverDef workgiver )