Merge pull request #210 from BobPalmer/DEVELOP

Fixed recyclers
UmbraSpaceIndustries · Jan 21, 2017 · 435432f · 435432f
2 parents 0c4836e + c851fef
commit 435432f
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 3 deletions.
diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/ChangeLog.txt b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/ChangeLog.txt
@@ -1,3 +1,7 @@
+0.5.20 - 2017.01.21
+-------------------
+Fixed issue with recyclers not calculating correctly
+
 0.5.19 - 2017.01.16
 -------------------
 Fixed more log spam

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/USI-LS.version b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/USI-LS.version
@@ -10,7 +10,7 @@
      "VERSION":{
          "MAJOR":0,
          "MINOR":5,
-         "PATCH":19,
+         "PATCH":20,
          "BUILD":0
      },
      "KSP_VERSION":{

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/USILifeSupport.dll b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/USILifeSupport.dll
diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/USILifeSupport.dll.mdb b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/USILifeSupport.dll.mdb
diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/USILifeSupport.pdb b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/USILifeSupport.pdb
diff --git a/Source/USILifeSupport/.vs/USILifeSupport/v14/.suo b/Source/USILifeSupport/.vs/USILifeSupport/v14/.suo
diff --git a/Source/USILifeSupport/LifeSupportManager.cs b/Source/USILifeSupport/LifeSupportManager.cs
@@ -309,9 +309,12 @@ internal static double GetRecyclerMultiplier(Vessel vessel)
             for(int i = 0; i < vCount; ++i)
             {
                 var v = vList[i];
-                for (int x = 0; x < rmCount; ++x)
+                var subRecList = v.FindPartModulesImplementing<ModuleLifeSupportRecycler>();
+                var subRmCount = subRecList.Count;
+
+                for (int x = 0; x < subRmCount; ++x)
                 {
-                    var r = recList[x];
+                    var r = subRecList[x];
                     if (r.IsActivated && r.RecyclerIsActive)
                     {
                         if (r.AdjustedRecyclePercent > recyclerCap)