1.1.5

Source/ResearchWhatever15/Patches/StudyManagerPatch.cs

@@ -15,7 +15,7 @@ namespace ResearchWhatever.Patches
     [HarmonyPatch(typeof(StudyManager), "StudyAnomaly")]
     static class StudyManager_StudyAnomaly_ResearchWhateverPatch
     {
-        private static readonly PropertyInfo LStudyCompleted = AccessTools.Property(typeof(ITab_StudyNotes), "StudyCompleted");
+        //private static readonly PropertyInfo LStudyCompleted = AccessTools.Property(typeof(ITab_StudyNotes), "StudyCompleted");
         internal static void Prefix(Thing studiedThing, Pawn studier, float knowledgeAmount, KnowledgeCategoryDef knowledgeCategory)
         {
             if (!ModsConfig.AnomalyActive)
@@ -47,25 +47,27 @@ namespace ResearchWhatever.Patches
             {
                 CompStudiable compStudiable = studiedThing.TryGetComp<CompStudiable>();
                 CompHoldingPlatformTarget compHoldingPlatformTarget = studiedThing.TryGetComp<CompHoldingPlatformTarget>();
-
                 bool b = false;
                 if (compStudiable != null)
+                    if (compStudiable.Props.Completable)
                         if (compStudiable.Completed)
                         {
                             compStudiable.studyEnabled = false;
                             b = true;
                         }
+                        else { }
                     else
                     {
-                        if (studiedThing.GetInspectTabs().FirstOrDefault(
-                                x => x is ITab_StudyNotes 
-                                || x.GetType().IsSubclassOf(typeof(ITab_StudyNotes))) is ITab_StudyNotes tab 
-                            && (bool)LStudyCompleted.GetValue(tab))
+                        var compStudyUnlocks = studiedThing.TryGetComp<CompStudyUnlocks>();
+                        if (compStudyUnlocks != null)
+                        {
+                            if (compStudyUnlocks.Completed)
                             {
                                 compStudiable.studyEnabled = false;
                                 b = true;
                             }
                         }
+                    }
                 //
                 if (compHoldingPlatformTarget != null)
                 {

change.log

@@ -1,4 +1,7 @@
-1.1.4
+1.1.5
+- fixed studiable objects would toggle off even if there is still something to study in their specific journal;
+
+1.1.4
 - studiable objects now also auto-toggle off;
 
 1.1.3