Bug Fixes

Angel-125 · Jul 23, 2016 · f064eee · f064eee
1 parent 163fccc
commit f064eee
Show file tree

Hide file tree

Showing 57 changed files with 132 additions and 16 deletions.
diff --git a/DSEVUtils/DSEVUtils.csproj b/DSEVUtils/DSEVUtils.csproj
@@ -49,7 +49,6 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
     <Reference Include="UnityEngine">

diff --git a/DSEVUtils/DSEVUtils.suo b/DSEVUtils/DSEVUtils.suo
diff --git a/DSEVUtils/ModuleHexTruss.cs b/DSEVUtils/ModuleHexTruss.cs
@@ -57,7 +57,8 @@ public class ModuleHexTruss : WBIMeshHelper
         string[] rackNames = null;
         string[] bodyNames = null;
         string centerVestibuleName = null;
-        WBIResourceSwitcher switcher;
+        WBIConvertibleStorage switcher = null;
+        PartModule resourceDistributor = null;
 
         #region GUI
         [KSPEvent(guiActiveEditor = true, guiActive = false, guiName = "Toggle center vestibule")]
@@ -180,7 +181,17 @@ public override void OnStart(StartState state)
             int nextIndex = -1;
 
             //Find the switch if any.
-            switcher = this.part.FindModuleImplementing<WBIResourceSwitcher>();
+            switcher = this.part.FindModuleImplementing<WBIConvertibleStorage>();
+
+            //Find the resource distributor if any
+            int totalCount = this.part.Modules.Count;
+            PartModule module;
+            for (int index = 0; index < totalCount; index++)
+            {
+                module = this.part.Modules[index];
+                if (module.moduleName == "WBIResourceDistributor")
+                    resourceDistributor = module;
+            }
 
             //Hide base GUI
             Events["NextMesh"].guiActive = false;
@@ -295,13 +306,29 @@ public virtual void SetVisibleObjects()
             {
                 if (fuelTankTransform.Contains(bodyNames[bodyIndex]))
                 {
+                    switcher.isEnabled = true;
+                    switcher.enabled = true;
                     switcher.SetGUIVisible(true);
+                    if (resourceDistributor != null)
+                    {
+                        resourceDistributor.isEnabled = true;
+                        resourceDistributor.enabled = true;
+                        resourceDistributor.Events["ToggleDistributionMode"].guiActive = true;
+                        resourceDistributor.Events["ToggleDistributionMode"].guiActiveEditor = true;
+                    }
                 }
                 else
                 {
                     switcher.SetGUIVisible(false);
                     switcher.isEnabled = false;
                     switcher.enabled = false;
+                    if (resourceDistributor != null)
+                    {
+                        resourceDistributor.isEnabled = false;
+                        resourceDistributor.enabled = false;
+                        resourceDistributor.Events["ToggleDistributionMode"].guiActive = false;
+                        resourceDistributor.Events["ToggleDistributionMode"].guiActiveEditor = false;
+                    }
                 }
             }
 

diff --git a/DSEVUtils/bin/Debug/Assembly-CSharp-firstpass.dll b/DSEVUtils/bin/Debug/Assembly-CSharp-firstpass.dll
diff --git a/DSEVUtils/bin/Debug/Assembly-CSharp.dll b/DSEVUtils/bin/Debug/Assembly-CSharp.dll
diff --git a/DSEVUtils/bin/Debug/Cooldown.dll b/DSEVUtils/bin/Debug/Cooldown.dll
diff --git a/DSEVUtils/bin/Debug/DSEVUtils.dll b/DSEVUtils/bin/Debug/DSEVUtils.dll
diff --git a/DSEVUtils/bin/Debug/DSEVUtils.pdb b/DSEVUtils/bin/Debug/DSEVUtils.pdb
diff --git a/DSEVUtils/bin/Debug/KSPAssets.dll b/DSEVUtils/bin/Debug/KSPAssets.dll
diff --git a/DSEVUtils/bin/Debug/KSPUtil.dll b/DSEVUtils/bin/Debug/KSPUtil.dll
diff --git a/DSEVUtils/bin/Debug/Mono.Cecil.dll b/DSEVUtils/bin/Debug/Mono.Cecil.dll
diff --git a/DSEVUtils/bin/Debug/Mono.Security.dll b/DSEVUtils/bin/Debug/Mono.Security.dll
diff --git a/DSEVUtils/bin/Debug/SaveUpgradePipeline.Core.dll b/DSEVUtils/bin/Debug/SaveUpgradePipeline.Core.dll
diff --git a/DSEVUtils/bin/Debug/TDx.TDxInput.dll b/DSEVUtils/bin/Debug/TDx.TDxInput.dll
diff --git a/DSEVUtils/bin/Debug/TrackIRUnity.dll b/DSEVUtils/bin/Debug/TrackIRUnity.dll
diff --git a/DSEVUtils/bin/Debug/UnityEngine.UI.dll b/DSEVUtils/bin/Debug/UnityEngine.UI.dll
diff --git a/DSEVUtils/bin/Debug/UnityEngine.dll b/DSEVUtils/bin/Debug/UnityEngine.dll
diff --git a/DSEVUtils/bin/Debug/Vectrosity.dll b/DSEVUtils/bin/Debug/Vectrosity.dll
diff --git a/DSEVUtils/bin/Debug/WildBlueTools.dll b/DSEVUtils/bin/Debug/WildBlueTools.dll
diff --git a/DSEVUtils/bin/Debug/WildBlueTools.pdb b/DSEVUtils/bin/Debug/WildBlueTools.pdb
diff --git a/DSEVUtils/obj/Debug/DSEVUtils.csprojResolveAssemblyReference.cache b/DSEVUtils/obj/Debug/DSEVUtils.csprojResolveAssemblyReference.cache
diff --git a/DSEVUtils/obj/Debug/DSEVUtils.dll b/DSEVUtils/obj/Debug/DSEVUtils.dll
diff --git a/DSEVUtils/obj/Debug/DSEVUtils.pdb b/DSEVUtils/obj/Debug/DSEVUtils.pdb
diff --git a/DSEVUtils/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/DSEVUtils/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/DSEVUtils/obj/Debug/NuclearEngines.csprojResolveAssemblyReference.cache b/DSEVUtils/obj/Debug/NuclearEngines.csprojResolveAssemblyReference.cache
diff --git a/DSEVUtils/obj/Debug/NuclearEngines.dll b/DSEVUtils/obj/Debug/NuclearEngines.dll
diff --git a/DSEVUtils/obj/Debug/NuclearEngines.pdb b/DSEVUtils/obj/Debug/NuclearEngines.pdb
diff --git a/DSEVUtils/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/DSEVUtils/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/DSEVUtils/obj/Release/NuclearEngines.csprojResolveAssemblyReference.cache b/DSEVUtils/obj/Release/NuclearEngines.csprojResolveAssemblyReference.cache
diff --git a/DSEVUtils/obj/Release/NuclearEngines.dll b/DSEVUtils/obj/Release/NuclearEngines.dll
diff --git a/DSEVUtils/obj/Release/NuclearEngines.pdb b/DSEVUtils/obj/Release/NuclearEngines.pdb
diff --git a/GameData/ModuleManager.2.6.25.dll b/GameData/ModuleManager.2.6.25.dll
diff --git a/GameData/WildBlueIndustries/000WildBlueTools/CommonTemplates/Storage/Konkrete.cfg b/GameData/WildBlueIndustries/000WildBlueTools/CommonTemplates/Storage/Konkrete.cfg
@@ -2,7 +2,7 @@ STORAGE_TEMPLATE
 {
 	name = Konkrete
 	author = Angel-125
-	shortName = Slag
+	shortName = Konkrete
 	logoPanel = WildBlueIndustries/000WildBlueTools/CommonTemplates/Decals/Konkrete
 	glowPanel = WildBlueIndustries/000WildBlueTools/CommonTemplates/Decals/KonkreteGlow
 	description = This kit stores konkrete, the prime building material used in permanent dwellings.

diff --git a/GameData/WildBlueIndustries/000WildBlueTools/ModuleManagerPatches/MM_CryoEngines.cfg b/GameData/WildBlueIndustries/000WildBlueTools/ModuleManagerPatches/MM_CryoEngines.cfg
@@ -24,17 +24,17 @@ STORAGE_TEMPLATE:NEEDS[SimpleBoiloff]
 
 STORAGE_TEMPLATE:NEEDS[SimpleBoiloff]
 {
-	name = Cryo
+	name = Oxidizer
 	author = Angel-125
-	shortName = Cryo
+	shortName = Oxidizer
 	logoPanel = WildBlueIndustries/000WildBlueTools/CommonTemplates/Decals/LFO
 	glowPanel = WildBlueIndustries/000WildBlueTools/CommonTemplates/Decals/LFOGlow
 	description = This kit stores oxidizer.
 
 	RESOURCE
 	{
 		name = Oxidizer
-		amount = 5600
-		maxAmount = 5600
+		amount = 1800
+		maxAmount = 1800
 	}
 }
diff --git a/GameData/WildBlueIndustries/000WildBlueTools/Plugins/MiniAVC.dll b/GameData/WildBlueIndustries/000WildBlueTools/Plugins/MiniAVC.dll
diff --git a/GameData/WildBlueIndustries/000WildBlueTools/Plugins/WildBlueTools.dll b/GameData/WildBlueIndustries/000WildBlueTools/Plugins/WildBlueTools.dll
diff --git a/GameData/WildBlueIndustries/000WildBlueTools/Readme.txt b/GameData/WildBlueIndustries/000WildBlueTools/Readme.txt
@@ -6,6 +6,15 @@ A KSP mod that provides common functionality for mods by Wild Blue Industries.
 
 Copy the contents of the mod's GameData directory into your GameData folder.
 
+1.3.9
+- Fixed an issue with the CryoFuels MM support to avoid duplicate templates.
+
+1.3.8
+- Fixed an issue with crew transfers not working after changing a part's crew capacity during a template switch.
+
+1.3.7
+- Fixed an issue with WBILight throwing NREs in the VAB/SPH.
+
 1.3.6
 - Minor bug fixes
 

diff --git a/GameData/WildBlueIndustries/000WildBlueTools/WildBlueTools.version b/GameData/WildBlueIndustries/000WildBlueTools/WildBlueTools.version
@@ -12,7 +12,7 @@
     {
 	"MAJOR":1,
 	"MINOR":3,
-	"PATCH":6
+	"PATCH":9
     },
     "KSP_VERSION":
     {

diff --git a/GameData/WildBlueIndustries/DSEV/DSEV.version b/GameData/WildBlueIndustries/DSEV/DSEV.version
@@ -11,8 +11,8 @@
     "VERSION":
     {
 	"MAJOR":1,
-	"MINOR":1,
-	"PATCH":9
+	"MINOR":2,
+	"PATCH":0
     },
     "KSP_VERSION":
     {

diff --git a/GameData/WildBlueIndustries/DSEV/Parts/FuelTank/FLM100.cfg b/GameData/WildBlueIndustries/DSEV/Parts/FuelTank/FLM100.cfg
@@ -87,4 +87,10 @@ MODULE
     showDecals = true
 }
 
+	MODULE:NEEDS[Pathfinder]
+	{
+		name = WBIResourceDistributor
+	}
+
+
 }
diff --git a/GameData/WildBlueIndustries/DSEV/Parts/FuelTank/FLM14400.cfg b/GameData/WildBlueIndustries/DSEV/Parts/FuelTank/FLM14400.cfg
@@ -92,4 +92,9 @@ PART
 	    decalsVisible = false
 	}
 
+	MODULE:NEEDS[Pathfinder]
+	{
+		name = WBIResourceDistributor
+	}
+
 }
diff --git a/GameData/WildBlueIndustries/DSEV/Parts/FuelTank/FLM1600.cfg b/GameData/WildBlueIndustries/DSEV/Parts/FuelTank/FLM1600.cfg
@@ -91,4 +91,9 @@ PART
 	    decalsVisible = false
 	}
 
+	MODULE:NEEDS[Pathfinder]
+	{
+		name = WBIResourceDistributor
+	}
+
 }
diff --git a/GameData/WildBlueIndustries/DSEV/Parts/FuelTank/FLM200.cfg b/GameData/WildBlueIndustries/DSEV/Parts/FuelTank/FLM200.cfg
@@ -79,6 +79,12 @@ PART
 	    //Name of the logo panel transforms
 	    logoPanelTransform = decalPanel001, decalPanel002, decalPanel003, decalPanel004
 	    decalsVisible = false
-}
+	}
+
+	MODULE:NEEDS[Pathfinder]
+	{
+		name = WBIResourceDistributor
+	}
+
 
 }
diff --git a/GameData/WildBlueIndustries/DSEV/Parts/FuelTank/FLM3200.cfg b/GameData/WildBlueIndustries/DSEV/Parts/FuelTank/FLM3200.cfg
@@ -89,4 +89,10 @@ PART
 		logoPanelTransform = decalPanel001, decalPanel002, decalPanel003, decalPanel004
 		decalsVisible = false
 	}
+
+	MODULE:NEEDS[Pathfinder]
+	{
+		name = WBIResourceDistributor
+	}
+
 }
diff --git a/GameData/WildBlueIndustries/DSEV/Parts/FuelTank/FLM3600.cfg b/GameData/WildBlueIndustries/DSEV/Parts/FuelTank/FLM3600.cfg
@@ -91,4 +91,9 @@ PART
 	    decalsVisible = false
 	}
 
+	MODULE:NEEDS[Pathfinder]
+	{
+		name = WBIResourceDistributor
+	}
+
 }
diff --git a/GameData/WildBlueIndustries/DSEV/Parts/FuelTank/FLM400.cfg b/GameData/WildBlueIndustries/DSEV/Parts/FuelTank/FLM400.cfg
@@ -81,4 +81,10 @@ PART
 	    decalsVisible = false
 	}
 
+	MODULE:NEEDS[Pathfinder]
+	{
+		name = WBIResourceDistributor
+	}
+
+
 }
diff --git a/GameData/WildBlueIndustries/DSEV/Parts/FuelTank/FLM6400.cfg b/GameData/WildBlueIndustries/DSEV/Parts/FuelTank/FLM6400.cfg
@@ -92,4 +92,9 @@ PART
 	    decalsVisible = false
 	}
 
+	MODULE:NEEDS[Pathfinder]
+	{
+		name = WBIResourceDistributor
+	}
+
 }
diff --git a/GameData/WildBlueIndustries/DSEV/Parts/FuelTank/FLM7200.cfg b/GameData/WildBlueIndustries/DSEV/Parts/FuelTank/FLM7200.cfg
@@ -89,4 +89,10 @@ PART
 		logoPanelTransform = decalPanel001, decalPanel002, decalPanel003, decalPanel004
 		decalsVisible = false
 	}
+
+	MODULE:NEEDS[Pathfinder]
+	{
+		name = WBIResourceDistributor
+	}
+
 }
diff --git a/GameData/WildBlueIndustries/DSEV/Parts/FuelTank/FLM800.cfg b/GameData/WildBlueIndustries/DSEV/Parts/FuelTank/FLM800.cfg
@@ -81,4 +81,9 @@ PART
 	    decalsVisible = false
 	}
 
+	MODULE:NEEDS[Pathfinder]
+	{
+		name = WBIResourceDistributor
+	}
+
 }
diff --git a/GameData/WildBlueIndustries/DSEV/Parts/Structural/HexTruss/HexTruss2.cfg b/GameData/WildBlueIndustries/DSEV/Parts/Structural/HexTruss/HexTruss2.cfg
@@ -57,7 +57,7 @@ PART
 
 	MODULE
 	{
-		name = WBIResourceSwitcher
+		name = WBIConvertibleStorage
 		enableLogging = True
 		showGUI = True
 
@@ -85,6 +85,11 @@ PART
 		decalsVisible = false
 	}
 
+	MODULE:NEEDS[Pathfinder]
+	{
+		name = WBIResourceDistributor
+	}
+
 	MODULE
 	{
 		name = ModuleHexTruss

diff --git a/GameData/WildBlueIndustries/DSEV/Parts/Structural/HexTruss/HexTrussDouble.cfg b/GameData/WildBlueIndustries/DSEV/Parts/Structural/HexTruss/HexTrussDouble.cfg
@@ -57,7 +57,7 @@ PART
 
 	MODULE
 	{
-		name = WBIResourceSwitcher
+		name = WBIConvertibleStorage
 		enableLogging = True
 		showGUI = True
 
@@ -85,6 +85,11 @@ PART
 		decalsVisible = false
 	}
 
+	MODULE:NEEDS[Pathfinder]
+	{
+		name = WBIResourceDistributor
+	}
+
 	MODULE
 	{
 		name = ModuleHexTruss

diff --git a/GameData/WildBlueIndustries/DSEV/Parts/Structural/HexTruss/HexTrussHalf.cfg b/GameData/WildBlueIndustries/DSEV/Parts/Structural/HexTruss/HexTrussHalf.cfg
@@ -57,7 +57,7 @@ PART
 
 	MODULE
 	{
-		name = WBIResourceSwitcher
+		name = WBIConvertibleStorage
 		enableLogging = True
 		showGUI = True
 
@@ -85,6 +85,11 @@ PART
 		decalsVisible = false
 	}
 
+	MODULE:NEEDS[Pathfinder]
+	{
+		name = WBIResourceDistributor
+	}
+
 	MODULE
 	{
 		name = ModuleHexTruss

diff --git a/GameData/WildBlueIndustries/DSEV/Parts/Structural/HexTruss/HexTrussQuarter.cfg b/GameData/WildBlueIndustries/DSEV/Parts/Structural/HexTruss/HexTrussQuarter.cfg
@@ -57,7 +57,7 @@ PART
 
 	MODULE
 	{
-		name = WBIResourceSwitcher
+		name = WBIConvertibleStorage
 		enableLogging = True
 		showGUI = True
 
@@ -85,6 +85,11 @@ PART
 		decalsVisible = false
 	}
 
+	MODULE:NEEDS[Pathfinder]
+	{
+		name = WBIResourceDistributor
+	}
+
 	MODULE
 	{
 		name = ModuleHexTruss

diff --git a/GameData/WildBlueIndustries/DSEV/Plugins/DSEVUtils.dll b/GameData/WildBlueIndustries/DSEV/Plugins/DSEVUtils.dll
diff --git a/GameData/WildBlueIndustries/DSEV/Plugins/MiniAVC.dll b/GameData/WildBlueIndustries/DSEV/Plugins/MiniAVC.dll
diff --git a/GameData/WildBlueIndustries/DSEV/Readme.txt b/GameData/WildBlueIndustries/DSEV/Readme.txt
@@ -18,6 +18,12 @@ Copy the WildBlueIndustries directory into your GameData folder.
 
 ---REVISION HISTORY---
 
+1.2.0
+- Fixed an issue where the Hex Trusses weren't providing the hollow truss configuration.
+- Fixed an issue where the Hex Trusses weren't allowing you to reconfigure the fuel tanks in their fuel tank configuration.
+- Hex Trusses now use the standard dialog for configuring resources.
+- All fuel tanks and trusses can now participate in Pathfinder's resource distribution system.
+
 1.1.9
 - Recompiled for latest WBT.
 

diff --git a/NuclearEngines.suo b/NuclearEngines.suo