fix: check for availability properly

PeteTimesSix · Apr 27, 2023 · cd9b167 · cd9b167
1 parent 38d5d29
commit cd9b167
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/ResearchReinvented/Source/Rimworld/WorkGivers/WorkGiver_Analyse.cs b/ResearchReinvented/Source/Rimworld/WorkGivers/WorkGiver_Analyse.cs
@@ -146,7 +146,7 @@ public static void BuildCache()
 			if (Find.ResearchManager.currentProj == null)
 				return;
 
-			foreach (var opportunity in MatchingOpportunities.Where(o => !o.IsFinished && o.requirement is ROComp_RequiresThing))
+			foreach (var opportunity in MatchingOpportunities.Where(o => o.CurrentAvailability == OpportunityAvailability.Available && o.requirement is ROComp_RequiresThing))
 			{
 				var thingDef = (opportunity.requirement as ROComp_RequiresThing)?.thingDef;
 				if (thingDef == null)

diff --git a/ResearchReinvented/Source/Rimworld/WorkGivers/WorkGiver_AnalyseInPlace.cs b/ResearchReinvented/Source/Rimworld/WorkGivers/WorkGiver_AnalyseInPlace.cs
@@ -154,7 +154,7 @@ public static void BuildCache()
 			if (Find.ResearchManager.currentProj == null)
 				return;
 
-			foreach (var opportunity in MatchingOpportunities.Where(o => !o.IsFinished && o.requirement is ROComp_RequiresThing))
+			foreach (var opportunity in MatchingOpportunities.Where(o => o.CurrentAvailability == OpportunityAvailability.Available && o.requirement is ROComp_RequiresThing))
 			{
 				var thingDef = (opportunity.requirement as ROComp_RequiresThing)?.thingDef;
 				if (thingDef == null)

diff --git a/ResearchReinvented/Source/Rimworld/WorkGivers/WorkGiver_AnalyseTerrain.cs b/ResearchReinvented/Source/Rimworld/WorkGivers/WorkGiver_AnalyseTerrain.cs
@@ -149,7 +149,7 @@ public static void BuildCache()
 			if (Find.ResearchManager.currentProj == null)
 				return;
 
-			foreach (var opportunity in MatchingOpportunities.Where(o => !o.IsFinished && o.requirement is ROComp_RequiresTerrain))
+			foreach (var opportunity in MatchingOpportunities.Where(o => o.CurrentAvailability == OpportunityAvailability.Available && o.requirement is ROComp_RequiresTerrain))
 			{
 				var terrainDef = (opportunity.requirement as ROComp_RequiresTerrain)?.terrainDef;
 				if (terrainDef == null)

diff --git a/ResearchReinvented/Source/Rimworld/WorkGivers/WorkGiver_ResearcherRR.cs b/ResearchReinvented/Source/Rimworld/WorkGivers/WorkGiver_ResearcherRR.cs
@@ -113,7 +113,7 @@ public static ResearchOpportunity OpportunityCache
 			{
 				if (cacheBuiltOnTick != Find.TickManager.TicksAbs)
 				{
-					_opportunityCache = MatchingOpportunities.FirstOrDefault();
+					_opportunityCache = MatchingOpportunities.Where(o => o.CurrentAvailability == OpportunityAvailability.Available).FirstOrDefault();
 				}
 				return _opportunityCache;
 			}

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