Updated forum post for new version, rebuilt DLLs after merge.

RimWorldCCLTeam · Apr 27, 2016 · af5d0cc · af5d0cc
2 parents 79e137c + 58ade25
commit af5d0cc
Show file tree

Hide file tree

Showing 20 changed files with 274 additions and 2,984 deletions.
diff --git a/DLL_Project/CommunityCoreLibrary.csproj b/DLL_Project/CommunityCoreLibrary.csproj
diff --git a/DLL_Project/Extensions/ResearchProjectDef_Extensions.cs b/DLL_Project/Extensions/ResearchProjectDef_Extensions.cs
@@ -1,16 +1,13 @@
-using CommunityCoreLibrary.ResearchTree;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Verse;
 
 namespace CommunityCoreLibrary
 {
-
     [StaticConstructorOnStartup]
     public static class ResearchProjectDef_Extensions
     {
-
         #region Static Data
 
         private static Dictionary<ushort, bool> isLockedOut;
@@ -21,10 +18,9 @@ static ResearchProjectDef_Extensions()
         {
             isLockedOut = new Dictionary<ushort, bool>();
             _unlocksCache = new Dictionary<ushort, List<Pair<Def, string>>>();
-
         }
 
-        #endregion
+        #endregion Static Data
 
         #region Availability
 
@@ -42,7 +38,7 @@ public static bool IsLockedOut( this ResearchProjectDef researchProjectDef )
         internal static bool _IsLockedOut( this ResearchProjectDef researchProjectDef, ResearchProjectDef initialDef )
         {
             bool rVal = false;
-            if( !isLockedOut.TryGetValue( researchProjectDef.shortHash, out rVal ) )
+            if ( !isLockedOut.TryGetValue( researchProjectDef.shortHash, out rVal ) )
             {
 #if DEBUG
                 CCL_Log.TraceMod(
@@ -107,7 +103,7 @@ public static bool HasResearchRequirement( this ResearchProjectDef researchProje
                 ) );
         }
 
-        #endregion
+        #endregion Availability
 
         #region Lists of affected data
 
@@ -199,11 +195,6 @@ public static List<Pair<Def, string>> GetUnlockDefsAndDescs( this ResearchProjec
             return unlocks;
         }
 
-        public static Node Node( this ResearchProjectDef research )
-        {
-            return ResearchTree.ResearchTree.Forest.FirstOrDefault( node => node.Research == research );
-        }
-
         public static List<Def> GetResearchRequirements( this ResearchProjectDef researchProjectDef )
         {
 #if DEBUG
@@ -314,8 +305,8 @@ public static List<ThingDef> GetThingsUnlocked( this ResearchProjectDef research
             var thingsOn = new List<ThingDef>();
             var researchThings = DefDatabase<ThingDef>.AllDefsListForReading.Where( t => (
                 ( !t.IsLockedOut() )&&
-                (t.GetResearchRequirements() != null) &&
-                (t.GetResearchRequirements().Contains(researchProjectDef))
+                ( t.GetResearchRequirements() != null ) &&
+                ( t.GetResearchRequirements().Contains( researchProjectDef ) )
             ) ).ToList();
 
             if ( !researchThings.NullOrEmpty() )
@@ -357,7 +348,7 @@ public static List<TerrainDef> GetTerrainUnlocked( this ResearchProjectDef resea
             var researchThings = DefDatabase<TerrainDef>.AllDefsListForReading.Where( t => (
                 ( !t.IsLockedOut() )&&
                 ( t.GetResearchRequirements() != null )&&
-                ( t.GetResearchRequirements().Contains(researchProjectDef))
+                ( t.GetResearchRequirements().Contains( researchProjectDef ) )
             ) ).ToList();
 
             if ( !researchThings.NullOrEmpty() )
@@ -389,25 +380,25 @@ public static List<RecipeDef> GetRecipesUnlocked( this ResearchProjectDef resear
                 ( d.researchPrerequisite == researchProjectDef )
             ) ).ToList();
 
-            if( !researchRecipes.NullOrEmpty() )
+            if ( !researchRecipes.NullOrEmpty() )
             {
                 recipes.AddRangeUnique( researchRecipes );
             }
 
             if ( thingDefs != null )
             {
                 // Add buildings for those recipes
-                foreach( var r in recipes )
+                foreach ( var r in recipes )
                 {
-                    if( !r.recipeUsers.NullOrEmpty() )
+                    if ( !r.recipeUsers.NullOrEmpty() )
                     {
                         thingDefs.AddRangeUnique( r.recipeUsers );
                     }
                     var recipeThings = DefDatabase<ThingDef>.AllDefsListForReading.Where( d => (
                         ( !d.recipes.NullOrEmpty() )&&
                         ( d.recipes.Contains( r ) )
                     ) ).ToList();
-                    if( !recipeThings.NullOrEmpty() )
+                    if ( !recipeThings.NullOrEmpty() )
                     {
                         thingDefs.AddRangeUnique( recipeThings );
                     }
@@ -423,12 +414,12 @@ public static List<RecipeDef> GetRecipesUnlocked( this ResearchProjectDef resear
             ) ).ToList();
 
             // Aggregate research
-            if( !advancedResearch.NullOrEmpty() )
+            if ( !advancedResearch.NullOrEmpty() )
             {
-                foreach( var a in advancedResearch )
+                foreach ( var a in advancedResearch )
                 {
                     recipes.AddRangeUnique( a.recipeDefs );
-                    if( thingDefs != null )
+                    if ( thingDefs != null )
                     {
                         thingDefs.AddRangeUnique( a.thingDefs );
                     }
@@ -500,13 +491,13 @@ public static List<string> GetSowTagsUnlocked( this ResearchProjectDef researchP
                 ( d.plant.sowResearchPrerequisites.Contains( researchProjectDef ) )
             ) ).ToList();
 
-            if( !researchPlants.NullOrEmpty() )
+            if ( !researchPlants.NullOrEmpty() )
             {
-                foreach( var plant in researchPlants )
+                foreach ( var plant in researchPlants )
                 {
                     sowTags.AddRangeUnique( plant.plant.sowTags );
                 }
-                if( thingDefs != null )
+                if ( thingDefs != null )
                 {
                     thingDefs.AddRangeUnique( researchPlants );
                 }