Skip to content

fixed issues with required Research Facilities display #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Sn1p3rr3c0n wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixed issues with required Research Facilities display #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 31 additions & 13 deletions Source/Graph/ResearchNode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,10 @@ public static bool BuildingPresent( ResearchNode node )

// try get from cache
bool result;
if ( _buildingPresentCache.TryGetValue( research, out result ) )
if ( _buildingPresentCache.TryGetValue( research, out result ))
{
return result;
}

// do the work manually
if ( research.requiredResearchBuilding == null ) {
Expand All @@ -190,6 +192,12 @@ public static bool BuildingPresent( ResearchNode node )
.Any(b => research.CanBeResearchedAt(b, true));
}

//Allso check for Facilities
if (result)
{
result = MissingFacilities(research).Count == 0;
}

if ( result ) {
result = node.MissingPrerequisites().All(BuildingPresent);
}
Expand Down Expand Up @@ -234,8 +242,10 @@ public static List<ThingDef> MissingFacilities( ResearchProjectDef research )
{
// try get from cache
List<ThingDef> missing;
if ( _missingFacilitiesCache.TryGetValue( research, out missing ) )
if (_missingFacilitiesCache.TryGetValue(research, out missing))
{
return missing;
}

// get list of all researches required before this
var thisAndPrerequisites = research.Ancestors().Where( rpd => !rpd.IsFinished ).ToList();
Expand All @@ -244,30 +254,38 @@ public static List<ThingDef> MissingFacilities( ResearchProjectDef research )
// get list of all available research benches
var availableBenches = Find.Maps.SelectMany( map => map.listerBuildings.allBuildingsColonist )
.OfType<Building_ResearchBench>();

var availableBenchDefs = availableBenches.Select( b => b.def ).Distinct();
missing = new List<ThingDef>();

// check each for prerequisites
// TODO: We should really build this list recursively so we can re-use results for prerequisites.
foreach ( var rpd in thisAndPrerequisites )
{
if ( rpd.requiredResearchBuilding == null )
continue;

if ( !availableBenchDefs.Contains( rpd.requiredResearchBuilding ) )
missing.Add( rpd.requiredResearchBuilding );

if ( rpd.requiredResearchFacilities.NullOrEmpty() )
continue;
if (rpd.requiredResearchBuilding != null)
{
if (!availableBenchDefs.Contains(rpd.requiredResearchBuilding))
{
missing.Add(rpd.requiredResearchBuilding);
}
}

foreach ( var facility in rpd.requiredResearchFacilities )
if ( !availableBenches.Any( b => b.HasFacility( facility ) ) )
missing.Add( facility );
if ( !rpd.requiredResearchFacilities.NullOrEmpty())
{
foreach (var facility in rpd.requiredResearchFacilities)
{
if (!availableBenches.Any(b => b.HasFacility(facility)))
{
missing.Add(facility);
}
}
}
}

// add to cache
missing = missing.Distinct().ToList();
_missingFacilitiesCache.Add( research, missing );

return missing;
}

Expand Down