Merge pull request #93 from BobPalmer/DEVELOP

2017.02.05 Release
UmbraSpaceIndustries · Feb 6, 2017 · c88c48a · c88c48a
2 parents 2facc6a + 0335d86
commit c88c48a
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 7 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.13 - 2017.02.04
+------------------
+Fixed some nullref spam in Animations related to logistics
+
 0.8.13 - 2017.02.04
 ------------------
 Fixed an issue with the new warehouse toggles

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

diff --git a/USITools/USITools/Logistics/ModuleLogisticsConsumer.cs b/USITools/USITools/Logistics/ModuleLogisticsConsumer.cs
@@ -88,6 +88,8 @@ public void FixedUpdate()
 
         }
 
+        private List<String> _blackList = new List<string> { "Machinery", "EnrichedUranium", "DepletedFuel", "Construction", "ReplacementParts" };
+
         private void CheckLogistics(List<ResourceRatio> resList, bool output)
         {
             //Surface only
@@ -115,7 +117,7 @@ private void CheckLogistics(List<ResourceRatio> resList, bool output)
             {
                 var res = resList[i];
                 //There are certain exeptions - specifically, anything for field repair.
-                if (res.ResourceName == "Machinery")
+                if (_blackList.Contains(res.ResourceName))
                     continue;
 
                 if (res.ResourceName != "ElectricCharge")

diff --git a/USITools/USITools/USIAnimation.cs b/USITools/USITools/USIAnimation.cs
@@ -241,10 +241,11 @@ private bool HasResource(ResourceRatio resInfo)
                 if (whp == part)
                     continue;
 
-                if (resInfo.ResourceName != "ElectricCharge")
+                var wh = whp.FindModuleImplementing<USI_ModuleResourceWarehouse>();
+
+                if (resInfo.ResourceName != "ElectricCharge" && wh != null)
                 {
-                    var wh = whp.FindModuleImplementing<USI_ModuleResourceWarehouse>();
-                    if (!wh.localTransferEnabled)
+                    if(!wh.localTransferEnabled)
                         continue;
                 }
                 if (whp.Resources.Contains(resourceName))
@@ -278,8 +279,9 @@ private void TakeResources(ResourceRatio resInfo)
                 if (whp == part)
                     continue;
                 var wh = whp.FindModuleImplementing<USI_ModuleResourceWarehouse>();
-                if (!wh.localTransferEnabled)
-                    continue;
+                if (wh != null)
+                    if(!wh.localTransferEnabled)
+                        continue;
                 if (whp.Resources.Contains(resourceName))
                 {
                     var res = whp.Resources[resourceName];