Merge pull request #138 from BobPalmer/DEVELOP

10/16 Releases
UmbraSpaceIndustries · Oct 16, 2016 · 73b71ba · 73b71ba
2 parents 42bff1a + e7ec1b7
commit 73b71ba
Show file tree

Hide file tree

Showing 13 changed files with 31 additions and 10 deletions.
diff --git a/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt b/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt
@@ -1,3 +1,7 @@
+0.8.2 - 2016.10.16
+------------------
+Made the nuclear pulse engine atmospheric nerf optional
+
 0.8.1 - 2016.10.15
 ------------------
 Fixed an issue that was causing swappable converters to shut down

diff --git a/FOR_RELEASE/GameData/000_USITools/USITools.dll b/FOR_RELEASE/GameData/000_USITools/USITools.dll
diff --git a/FOR_RELEASE/GameData/000_USITools/USITools.dll.mdb b/FOR_RELEASE/GameData/000_USITools/USITools.dll.mdb
diff --git a/FOR_RELEASE/GameData/000_USITools/USITools.pdb b/FOR_RELEASE/GameData/000_USITools/USITools.pdb
diff --git a/FOR_RELEASE/GameData/000_USITools/USITools.version b/FOR_RELEASE/GameData/000_USITools/USITools.version
@@ -10,7 +10,7 @@
      "VERSION":{
          "MAJOR":0,
          "MINOR":8,
-         "PATCH":1,
+         "PATCH":2,
          "BUILD":0
      },
      "KSP_VERSION":{

diff --git a/FOR_RELEASE/GameData/CommunityCategoryKit/CCK.dll.config b/FOR_RELEASE/GameData/CommunityCategoryKit/CCK.dll.config
diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/ChangeLog.txt b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/ChangeLog.txt
@@ -1,3 +1,7 @@
+0.5.3 - 2016.10.16
+------------------
+Fixed visual issue in VAB where crew was multiplying...
+
 0.5.2 - 2016.10.15
 ------------------
 Bundled correct CCK

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":2,
+         "PATCH":3,
          "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/LifeSupportMonitor_Editor.cs b/Source/USILifeSupport/LifeSupportMonitor_Editor.cs
@@ -78,6 +78,26 @@ private void OnWindow(int windowId)
             GenerateWindow();
         }
 
+        private void ResetValues()
+        {
+          curCrew = 0;
+          maxCrew = 0;
+          supplies = 0d;
+          extraHabTime = 0d;
+          habMult = 1d;
+          batteryAmount = 0d;
+          habs = new List<ModuleHabitation>();
+          hab_curCrew = "";
+          hab_maxCrew = "";
+          supply_curCrew = "";
+          supply_maxCrew = "";
+          totalHabSpace = 0d;
+          totalHabMult = 0d;
+          totalBatteryTime = 0d;
+          totalSupplyTime = 0d;
+          recyclers = new List<ModuleLifeSupportRecycler>();
+        }
+
         private int curCrew = 0;
         private int maxCrew = 0;
         private double supplies = 0d;
@@ -97,7 +117,7 @@ private void OnWindow(int windowId)
 
         private void UpdateGUIInfo(ShipConstruct ship)
         {
-            habs = new List<ModuleHabitation>();
+            ResetValues();
             if (EditorLogic.fetch != null)
             {
 
@@ -166,7 +186,6 @@ private void UpdateGUIInfo(ShipConstruct ship)
 
                 if (EditorLogic.fetch.ship.parts.Count > 0)
                 {
-                    recyclers = new List<ModuleLifeSupportRecycler>();
                     foreach (var p in EditorLogic.fetch.ship.parts)
                     {
                         var mod = p.FindModuleImplementing<ModuleLifeSupportRecycler>();