Merge pull request #101 from BobPalmer/DEVELOP

Fixed ground tether and PDU bugs
UmbraSpaceIndustries · Mar 17, 2017 · abdf7b0 · abdf7b0
2 parents e71807d + 2417603
commit abdf7b0
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 9 deletions.
diff --git a/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt b/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt
@@ -1,6 +1,6 @@
-0.8.17 - 2017.03.17
+0.8.18 - 2017.03.17
 -------------------
-Dependency Updates
+Fixed bugs related to ground tethers and PDU power transfers
 
 0.8.16 - 2017.02.24
 -------------------

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":17,
+         "PATCH":18,
          "BUILD":0
      },
      "KSP_VERSION":{

diff --git a/USITools/USITools/Logistics/ModuleLogisticsConsumer.cs b/USITools/USITools/Logistics/ModuleLogisticsConsumer.cs
@@ -149,12 +149,17 @@ private void CheckLogistics(List<ResourceRatio> resList, bool output)
                         continue;
 
                     var wh = p.FindModulesImplementing<USI_ModuleResourceWarehouse>();
-                    if (wh.Count == 0)
-                        return;
+                    if (wh.Count > 0)
+                    {
+                        if (!wh[0].localTransferEnabled)
+                            continue;
+                    }
+                    else
+                    {
+                        if (res.ResourceName != "ElectricCharge")
+                            continue;
+                    }                    
 
-                    if(!wh[0].localTransferEnabled)
-                        continue;
-
                     var rr = p.Resources[res.ResourceName];
                     if (rr.flowState)
                     {

diff --git a/USITools/USITools/ModuleStabilization.cs b/USITools/USITools/ModuleStabilization.cs
@@ -74,7 +74,7 @@ public void FixedUpdate()
                 return;
 
 
-            vessel.SetPosition(nuPos);
+            //vessel.SetPosition(nuPos);
 
             var c = vessel.parts.Count;
             for(int i = 0; i < c; ++i)