fixes

comms console job fix VE framework patch collision fix
PeteTimesSix · Jan 19, 2024 · 3ee8149 · 3ee8149
1 parent cc778c7
commit 3ee8149
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/ResearchReinvented/Source/HarmonyPatches/Prototypes/Frame_CompleteConstruction_Patches.cs b/ResearchReinvented/Source/HarmonyPatches/Prototypes/Frame_CompleteConstruction_Patches.cs
@@ -15,6 +15,7 @@
 namespace PeteTimesSix.ResearchReinvented.HarmonyPatches.Prototypes
 {
     [HarmonyPatch(typeof(Frame), nameof(Frame.CompleteConstruction))]
+    [HarmonyBefore(new string[]{ "OskarPotocki.VFECore" })]
     public static class Frame_CompleteConstruction_Patches
     {
 

diff --git a/ResearchReinvented/Source/Rimworld/WorkGivers/WorkGiver_LearnRemotely.cs b/ResearchReinvented/Source/Rimworld/WorkGivers/WorkGiver_LearnRemotely.cs
@@ -71,7 +71,7 @@ public override IEnumerable<Thing> PotentialWorkThingsGlobal(Pawn pawn)
             List<Thing> consoles = new List<Thing>();
             foreach(var def in CommsConsoles)
             {
-                consoles.AddRange(pawn.Map?.listerThings.ThingsOfDef(ThingDefOf.CommsConsole));
+                consoles.AddRange(pawn.Map?.listerThings.ThingsOfDef(def));
             }
             return consoles;
         }
@@ -92,6 +92,12 @@ public override bool HasJobOnThing(Pawn pawn, Thing thing, bool forced = false)
             if (!pawn.CanReserve(thing, 1, -1, null, forced))
                 return false;
 
+            if (!(thing is Building_CommsConsole commsConsole))
+                return false;
+
+            if (!commsConsole.CanUseCommsNow)
+                return false;
+
             if (OpportunityCache == null)
                 return false;
 

diff --git a/ResearchReinvented/v1.4/Assemblies/ResearchReinvented.dll b/ResearchReinvented/v1.4/Assemblies/ResearchReinvented.dll