diff --git a/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt b/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt index 175b027..c35bc23 100644 --- a/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt +++ b/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt @@ -1,3 +1,9 @@ +0.7.0 - 2016.03.29 +------------------ +Compatibility with KSP 1.1 +Moved out DynamicTanks DLL to ART +Info text / GUI text for Power Distributors, Couplers, and Warehouses (thanks bennord!) + 0.6.3 - 2016.03.02 ------------------ Logistics pulls are now restricted to warehouses diff --git a/FOR_RELEASE/GameData/000_USITools/DynamicTanks.dll b/FOR_RELEASE/GameData/000_USITools/DynamicTanks.dll deleted file mode 100644 index 9add676..0000000 Binary files a/FOR_RELEASE/GameData/000_USITools/DynamicTanks.dll and /dev/null differ diff --git a/FOR_RELEASE/GameData/000_USITools/USITools.dll b/FOR_RELEASE/GameData/000_USITools/USITools.dll index c21e091..3b40625 100644 Binary files a/FOR_RELEASE/GameData/000_USITools/USITools.dll and b/FOR_RELEASE/GameData/000_USITools/USITools.dll differ diff --git a/FOR_RELEASE/GameData/000_USITools/USITools.version b/FOR_RELEASE/GameData/000_USITools/USITools.version index ae347ed..51f49ff 100644 --- a/FOR_RELEASE/GameData/000_USITools/USITools.version +++ b/FOR_RELEASE/GameData/000_USITools/USITools.version @@ -9,14 +9,14 @@ }, "VERSION":{ "MAJOR":0, - "MINOR":6, - "PATCH":3, + "MINOR":7, + "PATCH":0, "BUILD":0 }, "KSP_VERSION":{ "MAJOR":1, - "MINOR":0, - "PATCH":5 + "MINOR":1, + "PATCH":0 }, "KSP_VERSION_MIN":{ "MAJOR":1, @@ -25,7 +25,7 @@ }, "KSP_VERSION_MAX":{ "MAJOR":1, - "MINOR":0, - "PATCH":5 + "MINOR":1, + "PATCH":0 } } \ No newline at end of file diff --git a/FOR_RELEASE/GameData/ModuleManager.2.6.18.dll b/FOR_RELEASE/GameData/ModuleManager.2.6.18.dll deleted file mode 100644 index 29a5e64..0000000 Binary files a/FOR_RELEASE/GameData/ModuleManager.2.6.18.dll and /dev/null differ diff --git a/FOR_RELEASE/GameData/ModuleManager.dll b/FOR_RELEASE/GameData/ModuleManager.dll new file mode 100644 index 0000000..5946050 Binary files /dev/null and b/FOR_RELEASE/GameData/ModuleManager.dll differ diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/ChangeLog.txt b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/ChangeLog.txt index 9765d9c..25ef5b8 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/ChangeLog.txt +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/ChangeLog.txt @@ -1,8 +1,12 @@ -0.3.15 - 2015.03.03 +0.4.0 - 2016.03.29 +------------- +Compatibility with KSP 1.1 + +0.3.15 - 2016.03.03 ------------------- Fixed that bug. For real this time. -0.3.14 - 2015.03.03 +0.3.14 - 2016.03.03 ------------------- Fixed a bug with resource consumption diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/FertTank125.mu b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/FertTank125.mu new file mode 100644 index 0000000..c8d08a2 Binary files /dev/null and b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/FertTank125.mu differ diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/FertTank250.mu b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/FertTank250.mu new file mode 100644 index 0000000..2c23e0b Binary files /dev/null and b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/FertTank250.mu differ diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/FertTank375.mu b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/FertTank375.mu new file mode 100644 index 0000000..ea84d71 Binary files /dev/null and b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/FertTank375.mu differ diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Fert_125.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Fert_125.cfg new file mode 100644 index 0000000..a3994fd --- /dev/null +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Fert_125.cfg @@ -0,0 +1,47 @@ +PART +{ +name = Fert_Tank_125 +module = Part +author = RoverDude + +MODEL +{ + model = UmbraSpaceIndustries/LifeSupport/Parts/FertTank125 +} + +rescaleFactor = 1 + +node_attach = 0,0,0.6,0,0,-1,1 +node_stack_top = 0.0, .25, 0.0, 0.0, 1.0, 0.0, 1 +node_stack_bottom = 0.0, -.25, 0.0, 0.0, -1.0, 0.0, 1 + + +TechRequired = survivability +entryCost = 3000 +cost = 500 +category = Utility +subcategory = 0 +title = Fertilizer Tank (1.25) +manufacturer = Umbra Space Industries +description = A tank filled to the brim with Super-Gro Fertilizer. It's what plants crave! +attachRules = 1,1,1,1,0 + +// --- standard part parameters --- +mass = 0.1 +dragModelType = default +maximum_drag = 0.2 +minimum_drag = 0.2 +angularDrag = 2 +crashTolerance = 7 +maxTemp = 2000 // = 3000 +bulkheadProfiles = size1,srf + +RESOURCE +{ + name = Fertilizer + amount = 500 + maxAmount = 500 +} + + +} diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Fert_250.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Fert_250.cfg new file mode 100644 index 0000000..588b9a2 --- /dev/null +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Fert_250.cfg @@ -0,0 +1,47 @@ +PART +{ +name = Fert_Tank_250 +module = Part +author = RoverDude + +MODEL +{ + model = UmbraSpaceIndustries/LifeSupport/Parts/FertTank250 +} + +rescaleFactor = 1 + +node_attach = 0,0,1.2,0,0,-1,2 +node_stack_top = 0.0, .5, 0.0, 0.0, 1.0, 0.0, 2 +node_stack_bottom = 0.0, -.5, 0.0, 0.0, -1.0, 0.0, 2 + + +TechRequired = survivability +entryCost = 3000 +cost = 1000 +category = Utility +subcategory = 0 +title = Fertilizer Tank (2.5) +manufacturer = Umbra Space Industries +description = A tank filled to the brim with Super-Gro Fertilizer. It's what plants crave! +attachRules = 1,1,1,1,0 + +// --- standard part parameters --- +mass = 0.9 +dragModelType = default +maximum_drag = 0.2 +minimum_drag = 0.2 +angularDrag = 2 +crashTolerance = 7 +maxTemp = 2000 // = 3000 +bulkheadProfiles = size2,srf + +RESOURCE +{ + name = Fertilizer + amount = 4500 + maxAmount = 4500 +} + + +} diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Fert_375.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Fert_375.cfg new file mode 100644 index 0000000..c543df2 --- /dev/null +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Fert_375.cfg @@ -0,0 +1,45 @@ +PART +{ +name = Fert_Tank_375 +module = Part +author = RoverDude + +MODEL +{ + model = UmbraSpaceIndustries/LifeSupport/Parts/FertTank375 +} +rescaleFactor = 1 + +node_attach = 0,0,1.8,0,0,-1,3 +node_stack_top = 0.0, .75, 0.0, 0.0, 1.0, 0.0, 3 +node_stack_bottom = 0.0, -.75, 0.0, 0.0, -1.0, 0.0, 3 + + +TechRequired = survivability +entryCost = 3000 +cost = 1500 +category = Utility +subcategory = 0 +title = Fertilizer Tank (3.75) +manufacturer = Umbra Space Industries +description = A tank filled to the brim with Super-Gro Fertilizer. It's what plants crave! +attachRules = 1,1,1,1,0 + +// --- standard part parameters --- +mass = 3.0 +dragModelType = default +maximum_drag = 0.2 +minimum_drag = 0.2 +angularDrag = 2 +crashTolerance = 7 +maxTemp = 2000 // = 3000 +bulkheadProfiles = size3,srf + +RESOURCE +{ + name = Fertilizer + amount = 15000 + maxAmount = 15000 +} + +} diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/NomTank.png b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/NomTank.png new file mode 100644 index 0000000..08df511 Binary files /dev/null and b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/NomTank.png differ diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/NomTank_N_NRM.png b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/NomTank_N_NRM.png new file mode 100644 index 0000000..47e1206 Binary files /dev/null and b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/NomTank_N_NRM.png differ diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/USI-LS.version b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/USI-LS.version index a966fd6..3fc5458 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/USI-LS.version +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/USI-LS.version @@ -9,23 +9,23 @@ }, "VERSION":{ "MAJOR":0, - "MINOR":3, - "PATCH":15, + "MINOR":4, + "PATCH":0, "BUILD":0 }, "KSP_VERSION":{ "MAJOR":1, - "MINOR":0, - "PATCH":5 + "MINOR":1, + "PATCH":0 }, "KSP_VERSION_MIN":{ "MAJOR":1, - "MINOR":0, + "MINOR":1, "PATCH":0 }, "KSP_VERSION_MAX":{ "MAJOR":1, - "MINOR":0, - "PATCH":5 + "MINOR":1, + "PATCH":0 } } diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/USILifeSupport.dll b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/USILifeSupport.dll index 19d567b..2fd8925 100644 Binary files a/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/USILifeSupport.dll and b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/USILifeSupport.dll differ diff --git a/Source/USILifeSupport/LifeSupportManager.cs b/Source/USILifeSupport/LifeSupportManager.cs index 87ac827..c9ff320 100644 --- a/Source/USILifeSupport/LifeSupportManager.cs +++ b/Source/USILifeSupport/LifeSupportManager.cs @@ -1,11 +1,10 @@ +using KolonyTools; using System; using System.Collections.Generic; using System.Linq; -using KolonyTools; using UnityEngine; - namespace LifeSupport { public class LifeSupportManager : MonoBehaviour diff --git a/Source/USILifeSupport/LifeSupportMonitor.cs b/Source/USILifeSupport/LifeSupportMonitor.cs index f4d3dbe..59d18d4 100644 --- a/Source/USILifeSupport/LifeSupportMonitor.cs +++ b/Source/USILifeSupport/LifeSupportMonitor.cs @@ -6,6 +6,7 @@ using System.Linq; using System.Reflection; using System.Text; +using KSP.UI.Screens; using UnityEngine; using Random = System.Random; @@ -34,6 +35,7 @@ public class LifeSupportMonitor : MonoBehaviour private GUIStyle _scrollStyle; private Vector2 scrollPos = Vector2.zero; private bool _hasInitStyles = false; + public static bool renderDisplay = false; void Awake() { @@ -47,7 +49,7 @@ void Awake() private void GuiOn() { - RenderingManager.AddToPostDrawQueue(144, Ondraw); + renderDisplay = true; } public void Start() @@ -58,7 +60,20 @@ public void Start() private void GuiOff() { - RenderingManager.RemoveFromPostDrawQueue(144, Ondraw); + renderDisplay = false; + } + + + private void OnGUI() + { + if (!renderDisplay) + return; + + if (Event.current.type == EventType.Repaint || Event.current.isMouse) + { + //preDrawQueue + } + Ondraw(); } diff --git a/Source/USILifeSupport/LifeSupportMonitor_Editor.cs b/Source/USILifeSupport/LifeSupportMonitor_Editor.cs index c28fcb0..01b27c2 100644 --- a/Source/USILifeSupport/LifeSupportMonitor_Editor.cs +++ b/Source/USILifeSupport/LifeSupportMonitor_Editor.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Reflection; using System.Collections.Generic; +using KSP.UI.Screens; using UnityEngine; namespace LifeSupport @@ -18,6 +19,8 @@ public class LifeSupportMonitor_Editor : MonoBehaviour private GUIStyle _scrollStyle; private Vector2 scrollPos = Vector2.zero; private bool _hasInitStyles = false; + public static bool renderDisplay = false; + void Awake() { @@ -31,7 +34,7 @@ void Awake() private void GuiOn() { - RenderingManager.AddToPostDrawQueue(144, Ondraw); + renderDisplay = true; } public void Start() @@ -42,7 +45,19 @@ public void Start() private void GuiOff() { - RenderingManager.RemoveFromPostDrawQueue(144, Ondraw); + renderDisplay = false; + } + + private void OnGUI() + { + if (!renderDisplay) + return; + + if (Event.current.type == EventType.Repaint || Event.current.isMouse) + { + //preDrawQueue + } + Ondraw(); } diff --git a/Source/USILifeSupport/ModuleLifeSupport.cs b/Source/USILifeSupport/ModuleLifeSupport.cs index 078d709..faccc95 100644 --- a/Source/USILifeSupport/ModuleLifeSupport.cs +++ b/Source/USILifeSupport/ModuleLifeSupport.cs @@ -91,8 +91,10 @@ public void FixedUpdate() try { bool isLongLoop = false; - bool offKerbin = !LifeSupportManager.IsOnKerbin(part.vessel); - + bool offKerbin = true; + if(HighLogic.LoadedSceneIsFlight) + offKerbin = !LifeSupportManager.IsOnKerbin(part.vessel); + UnlockTins(); //Check our time double deltaTime = GetDeltaTime(); @@ -105,9 +107,6 @@ public void FixedUpdate() isLongLoop = true; _lastProcessingTime = Planetarium.GetUniversalTime(); } - - - var v = LifeSupportManager.Instance.FetchVessel(part.vessel.id.ToString()); v.LastUpdate = Planetarium.GetUniversalTime(); v.VesselName = part.vessel.vesselName; diff --git a/Source/USILifeSupport/ModuleLifeSupportRecycler.cs b/Source/USILifeSupport/ModuleLifeSupportRecycler.cs index e9870e4..2e3a098 100644 --- a/Source/USILifeSupport/ModuleLifeSupportRecycler.cs +++ b/Source/USILifeSupport/ModuleLifeSupportRecycler.cs @@ -10,7 +10,7 @@ public class ModuleLifeSupportRecycler : ModuleResourceConverter [KSPField] public float RecyclePercent = 0f; - [KSPField] + [KSPField(isPersistant = true)] public bool RecyclerIsActive = false; protected override void PostProcess(ConverterResults result, double deltaTime) diff --git a/Source/USILifeSupport/USILifeSupport.csproj b/Source/USILifeSupport/USILifeSupport.csproj index b2625c1..7972f42 100644 --- a/Source/USILifeSupport/USILifeSupport.csproj +++ b/Source/USILifeSupport/USILifeSupport.csproj @@ -35,6 +35,10 @@ ..\..\..\..\KSP_DEV\KSP_Data\Managed\Assembly-CSharp.dll False + + ..\..\..\..\KSP_DEV\KSP_Data\Managed\KSPUtil.dll + False + @@ -45,9 +49,12 @@ ..\..\..\..\KSP_DEV\KSP_Data\Managed\UnityEngine.dll False + + ..\..\..\..\KSP_DEV\KSP_Data\Managed\UnityEngine.UI.dll + False + ..\..\..\..\KSP_DEV\GameData\000_USITools\USITools.dll - False