Throughout: Change in-module "_Active" references to "toggleActive" property.
--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@@ -39,7 +39,7 @@
// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-[assembly: AssemblyVersion("0.12.0.*")]
+[assembly: AssemblyVersion("0.13.*")]
// The following attributes are used to specify the signing key for the assembly,
// if desired. See the Mono documentation for more information about signing.
//[assembly: AssemblyDelaySign(false)]
--- a/VOID.csproj
+++ b/VOID.csproj
@@ -96,6 +96,7 @@
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="VOID_HUDAdvanced.cs" />
<Compile Include="VOID_TWR.cs" />
+ <Compile Include="VOID_CareerStatus.cs" />
</ItemGroup>
<ProjectExtensions>
<MonoDevelop>
--- /dev/null
+++ b/VOID_CareerStatus.cs
@@ -1,1 +1,291 @@
-
+// VOID
+//
+// VOID_CareerStatus.cs
+//
+// Copyright © 2014, toadicus
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice,
+// this list of conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation and/or other
+// materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used
+// to endorse or promote products derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+using KSP;
+using System;
+using System.Text;
+using ToadicusTools;
+using UnityEngine;
+
+namespace VOID
+{
+ public class VOID_CareerStatus : VOID_WindowModule
+ {
+ public static VOID_CareerStatus Instance
+ {
+ get;
+ private set;
+ }
+
+ public static string formatDelta(double delta)
+ {
+ if (delta > 0)
+ {
+ return string.Format("<color='green'>{0:#,#.##}↑</color>", delta);
+ }
+ else if (delta < 0)
+ {
+ return string.Format("<color='red'>{0:#,#.##}↓</color>", delta);
+ }
+ else
+ {
+ return string.Intern("0");
+ }
+ }
+
+ public static string formatDelta(float delta)
+ {
+ return formatDelta((double)delta);
+ }
+
+ private GUIContent fundsContent;
+ private GUIContent repContent;
+ private GUIContent scienceContent;
+
+ private Texture2D fundsIconGreen;
+ private Texture2D fundsIconRed;
+ private Texture2D reputationIconGreen;
+ private Texture2D reputationIconRed;
+ private Texture2D scienceIcon;
+
+ public override bool toggleActive
+ {
+ get
+ {
+ switch (HighLogic.CurrentGame.Mode)
+ {
+ case Game.Modes.CAREER:
+ case Game.Modes.SCIENCE_SANDBOX:
+ return base.toggleActive;
+ default:
+ return false;
+ }
+ }
+ set
+ {
+ switch (HighLogic.CurrentGame.Mode)
+ {
+ case Game.Modes.CAREER:
+ case Game.Modes.SCIENCE_SANDBOX:
+ base.toggleActive = value;
+ break;
+ default:
+ return;
+ }
+ }
+ }
+
+ public double lastFundsChange
+ {
+ get;
+ private set;
+ }
+
+ public float lastRepChange
+ {
+ get;
+ private set;
+ }
+
+ public float lastScienceChange
+ {
+ get;
+ private set;
+ }
+
+ public double currentFunds
+ {
+ get;
+ private set;
+ }
+
+ public float currentReputation
+ {
+ get;
+ private set;
+ }
+
+ public float currentScience
+ {
+ get;
+ private set;
+ }
+
+ public override void ModuleWindow(int _)
+ {
+ GUILayout.BeginVertical();
+
+ GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+ GUILayout.Label(VOID_Data.fundingStatus.Label);
+ GUILayout.FlexibleSpace();
+ this.fundsContent.text = VOID_Data.fundingStatus.Value;
+ GUILayout.Label(this.fundsContent, GUILayout.ExpandWidth(false));
+ GUILayout.EndHorizontal();
+
+ GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+ GUILayout.Label(VOID_Data.reputationStatus.Label);
+ GUILayout.FlexibleSpace();
+ this.repContent.text = VOID_Data.reputationStatus.Value;
+ GUILayout.Label(this.repContent, GUILayout.ExpandWidth(false));
+ GUILayout.EndHorizontal();
+
+ GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+ GUILayout.Label(VOID_Data.scienceStatus.Label);
+ GUILayout.FlexibleSpace();
+ this.scienceContent.text = VOID_Data.scienceStatus.Value;
+ GUILayout.Label(this.scienceContent, GUILayout.ExpandWidth(false));
+ GUILayout.EndHorizontal();
+
+ GUILayout.EndVertical();
+
+ GUI.DragWindow();
+ }
+
+ private void onFundsChange(double newValue)
+ {
+ this.lastFundsChange = newValue - this.currentFunds;
+ this.currentFunds = newValue;
+ }
+
+ private void onRepChange(float newValue)
+ {
+ this.lastRepChange = newValue - this.currentReputation;
+ this.currentReputation = newValue;
+ }
+
+ private void onScienceChange(float newValue)
+ {
+ this.lastScienceChange = newValue - this.currentScience;
+ this.currentScience = newValue;
+ }
+
+ /*
+ * MissionRecoveryDialog::fundsIconGreen.name: UiElements_05
+ * MissionRecoveryDialog::fundsIconRed.name: UiElements_06
+ * MissionRecoveryDialog::reputationIconGreen.name: UiElements_07
+ * MissionRecoveryDialog::reputationIconRed.name: UiElements_08
+ * MissionRecoveryDialog::scienceIcon.name: UiElements_12
+ * */
+ public VOID_CareerStatus() : base()
+ {
+ VOID_CareerStatus.Instance = this;
+
+ this._Name = "Career Status";
+
+ GameEvents.OnFundsChanged.Add(this.onFundsChange);
+ GameEvents.OnReputationChanged.Add(this.onRepChange);
+ GameEvents.OnScienceChanged.Add(this.onScienceChange);
+
+ bool texturesLoaded;
+
+ texturesLoaded = IOTools.LoadTexture(out this.fundsIconGreen, "VOID/Textures/fundsgreen.png", 10, 18);
+ texturesLoaded &= IOTools.LoadTexture(out this.fundsIconRed, "VOID/Textures/fundsred.png", 10, 18);
+ texturesLoaded &= IOTools.LoadTexture(out this.reputationIconGreen, "VOID/Textures/repgreen.png", 16, 18);
+ texturesLoaded &= IOTools.LoadTexture(out this.reputationIconRed, "VOID/Textures/repred.png", 16, 18);
+ texturesLoaded &= IOTools.LoadTexture(out this.scienceIcon, "VOID/Textures/science.png", 16, 18);
+
+ this.fundsContent = new GUIContent();
+ this.repContent = new GUIContent();
+ this.scienceContent = new GUIContent();
+
+ if (texturesLoaded)
+ {
+ this.fundsContent.image = this.fundsIconGreen;
+ this.repContent.image = this.reputationIconGreen;
+ this.scienceContent.image = this.scienceIcon;
+ }
+
+ this.currentFunds = Funding.Instance != null ? Funding.Instance.Funds : double.NaN;
+ this.currentReputation = Reputation.Instance != null ? Reputation.Instance.reputation : float.NaN;
+ this.currentScience = ResearchAndDevelopment.Instance != null ?
+ ResearchAndDevelopment.Instance.Science : float.NaN;
+ }
+
+ ~VOID_CareerStatus()
+ {
+ GameEvents.OnFundsChanged.Remove(this.onFundsChange);
+ GameEvents.OnReputationChanged.Remove(this.onRepChange);
+ GameEvents.OnScienceChanged.Remove(this.onScienceChange);
+
+ VOID_CareerStatus.Instance = null;
+ }
+ }
+
+ public static partial class VOID_Data
+ {
+ public static readonly VOID_StrValue fundingStatus = new VOID_StrValue(
+ string.Intern("Funds"),
+ delegate()
+ {
+ if (VOID_CareerStatus.Instance == null)
+ {
+ return string.Empty;
+ }
+
+ return string.Format("{0} ({1})",
+ VOID_CareerStatus.Instance.currentFunds.ToString("#,#.##"),
+ VOID_CareerStatus.formatDelta(VOID_CareerStatus.Instance.lastFundsChange)
+ );
+ }
+ );
+
+ public static readonly VOID_StrValue reputationStatus = new VOID_StrValue(
+ string.Intern("Reputation"),
+ delegate()
+ {
+ if (VOID_CareerStatus.Instance == null)
+ {
+ return string.Empty;
+ }
+
+ return string.Format("{0} ({1})",
+ VOID_CareerStatus.Instance.currentReputation.ToString("#,#.##"),
+ VOID_CareerStatus.formatDelta(VOID_CareerStatus.Instance.lastRepChange)
+ );
+ }
+ );
+
+ public static readonly VOID_StrValue scienceStatus = new VOID_StrValue(
+ string.Intern("Science"),
+ delegate()
+ {
+ if (VOID_CareerStatus.Instance == null)
+ {
+ return string.Empty;
+ }
+
+ return string.Format("{0} ({1})",
+ VOID_CareerStatus.Instance.currentScience.ToString("#,#.##"),
+ VOID_CareerStatus.formatDelta(VOID_CareerStatus.Instance.lastScienceChange)
+ );
+ }
+ );
+ }
+}
+
+
--- a/VOID_Core.cs
+++ b/VOID_Core.cs
@@ -175,6 +175,8 @@
protected VOID_SaveValue<bool> _UseToolbarManager;
internal IButton ToolbarButton;
+ internal ApplicationLauncherButton AppLauncherButton;
+
/*
* Properties
* */
@@ -333,6 +335,12 @@
}
if (value == true)
{
+ if (this.AppLauncherButton != null)
+ {
+ ApplicationLauncher.Instance.RemoveModApplication(this.AppLauncherButton);
+ this.AppLauncherButton = null;
+ }
+
this.InitializeToolbarButton();
}
@@ -366,9 +374,9 @@
if (!this.UseToolbarManager)
{
- if (GUI.Button(VOIDIconPos, VOIDIconTexture, this.iconStyle) && this.VOIDIconLocked)
- {
- this.ToggleMainWindow();
+ if (this.AppLauncherButton == null)
+ {
+ this.InitializeAppLauncherButton();
}
}
else if (this.ToolbarButton == null)
@@ -483,6 +491,7 @@
double radius = this.vessel.Radius();
SimManager.Gravity = this.vessel.mainBody.gravParameter /
(radius * radius);
+ SimManager.minSimTime = (long)(this.updatePeriod * 1000);
SimManager.TryStartSimulation();
}
else if (!this.vesselSimActive)
@@ -900,6 +909,27 @@
};
Tools.PostDebugMessage(string.Format("{0}: Toolbar Button initialized.", this.GetType().Name));
+ }
+
+ protected void InitializeAppLauncherButton()
+ {
+ if (ApplicationLauncher.Ready)
+ {
+ this.AppLauncherButton = ApplicationLauncher.Instance.AddModApplication(
+ this.ToggleMainWindow, this.ToggleMainWindow,
+ HighLogic.LoadedScene.ToAppScenes(),
+ this.VOIDIconTexture
+ );
+
+ Tools.PostDebugMessage(
+ this,
+ "AppLauncherButton initialized in {0}",
+ Enum.GetName(
+ typeof(GameScenes),
+ HighLogic.LoadedScene
+ )
+ );
+ }
}
protected void ToggleMainWindow()
@@ -936,7 +966,12 @@
this.ToolbarButton.TexturePath = texturePath;
}
- this.VOIDIconTexture = GameDatabase.Instance.GetTexture(texturePath, false);
+ this.VOIDIconTexture = GameDatabase.Instance.GetTexture(texturePath.Replace("icon", "appIcon"), false);
+
+ if (this.AppLauncherButton != null)
+ {
+ this.AppLauncherButton.SetTexture(VOIDIconTexture);
+ }
}
protected void CheckAndSave()
@@ -988,6 +1023,27 @@
this.configDirty = false;
}
+ public void onSceneChangeRequested(GameScenes scene)
+ {
+ if (this.AppLauncherButton != null)
+ {
+ if (this is VOID_EditorCore)
+ {
+ if (!HighLogic.LoadedSceneIsEditor)
+ {
+ ApplicationLauncher.Instance.RemoveModApplication(this.AppLauncherButton);
+ }
+ }
+ else
+ {
+ if (!HighLogic.LoadedSceneIsFlight)
+ {
+ ApplicationLauncher.Instance.RemoveModApplication(this.AppLauncherButton);
+ }
+ }
+ }
+ }
+
protected VOID_Core()
{
this._Name = "VOID Core";
@@ -996,7 +1052,7 @@
this.VoidVersion = string.Format("{0}.{1}.{2}", version.Major, version.Minor, version.MajorRevision);
- this._Active.value = true;
+ this.toggleActive = true;
this._skinName = this.defaultSkin;
this._skinIdx = int.MinValue;
--- a/VOID_EditorHUD.cs
+++ b/VOID_EditorHUD.cs
@@ -120,7 +120,7 @@
{
this._Name = "Heads-Up Display";
- this._Active.value = true;
+ this.toggleActive = true;
this.textColors.Add(Color.green);
this.textColors.Add(Color.black);
@@ -164,6 +164,8 @@
return;
}
+ GUI.skin = this.core.Skin;
+
Rect hudPos = new Rect (hudLeft, 48, 300, 32);
hudString = new StringBuilder();
--- a/VOID_HUD.cs
+++ b/VOID_HUD.cs
@@ -85,7 +85,7 @@
{
this._Name = "Heads-Up Display";
- this._Active.value = true;
+ this.toggleActive = true;
this._colorIndex = 0;
@@ -216,6 +216,8 @@
this.core.LabelStyles["hud"].normal.textColor = textColors [ColorIndex];
+ GUI.skin = this.core.Skin;
+
if ((TimeWarp.WarpMode == TimeWarp.Modes.LOW) || (TimeWarp.CurrentRate <= TimeWarp.MaxPhysicsRate))
{
SimManager.RequestSimulation();
--- a/VOID_HUDAdvanced.cs
+++ b/VOID_HUDAdvanced.cs
@@ -78,7 +78,7 @@
{
this._Name = "Advanced Heads-Up Display";
- this._Active.value = true;
+ this.toggleActive = true;
this.leftHUDdefaultPos = new Rect(
Screen.width * .5f - (float)GameSettings.UI_SIZE * .25f - 300f,
@@ -378,7 +378,7 @@
public static readonly VOID_DoubleValue vesselAccel = new VOID_DoubleValue(
"Acceleration",
() => geeForce * KerbinGee,
- "m/s"
+ "m/s²"
);
public static readonly VOID_IntValue vesselCrewCount = new VOID_IntValue(
--- a/VOID_Module.cs
+++ b/VOID_Module.cs
@@ -231,7 +231,9 @@
this.core.windowID,
_Pos,
VOID_Tools.GetWindowHandler(this.ModuleWindow),
- this.Name
+ this.Name,
+ GUILayout.Width(this.defWidth),
+ GUILayout.Height(this.defHeight)
);
_Pos = Tools.ClampRectToScreen (_Pos);
--- a/VOID_Rendezvous.cs
+++ b/VOID_Rendezvous.cs
@@ -130,7 +130,7 @@
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
GUILayout.Label(" ", GUILayout.ExpandWidth(true));
- if (GUILayout.Button("Close", GUILayout.ExpandWidth(false))) this._Active = false;
+ if (GUILayout.Button("Close", GUILayout.ExpandWidth(false))) this.toggleActive = false;
GUILayout.EndHorizontal();
GUILayout.EndVertical();
--- a/VOID_TWR.cs
+++ b/VOID_TWR.cs
@@ -76,84 +76,6 @@
public class VOID_EditorTWR : VOID_TWR, IVOID_EditorModule {}
- public class CBListComparer : IComparer<CelestialBody>
- {
- public int Compare(CelestialBody bodyA, CelestialBody bodyB)
- {
- Tools.PostDebugMessage(this, "got bodyA: {0} & bodyB: {1}", bodyA, bodyB);
-
- if (bodyA == null && bodyB == null)
- {
- Tools.PostDebugMessage(this, "both bodies are null, returning 0");
- return 0;
- }
- if (bodyA == null)
- {
- Tools.PostDebugMessage(this, "bodyA is null, returning -1");
- return -1;
- }
- if (bodyB == null)
- {
- Tools.PostDebugMessage(this, "bodyB is null, returning 1");
- return 1;
- }
-
- Tools.PostDebugMessage(this, "bodies are not null, carrying on");
-
- if (object.ReferenceEquals(bodyA, bodyB))
- {
- Tools.PostDebugMessage(this, "bodies are equal, returning 0");
- return 0;
- }
-
- Tools.PostDebugMessage(this, "bodies are not equal, carrying on");
-
- if (bodyA.orbitDriver == null)
- {
- Tools.PostDebugMessage(this, "bodyA.orbit is null (bodyA is the sun, returning 1");
- return 1;
- }
- if (bodyB.orbitDriver == null)
- {
- Tools.PostDebugMessage(this, "bodyB.orbit is null (bodyB is the sun, returning -1");
- return -1;
- }
-
- Tools.PostDebugMessage(this, "orbits are not null, carrying on");
-
- if (bodyA.orbit.referenceBody == bodyB.orbit.referenceBody)
- {
- Tools.PostDebugMessage(this, "bodies share a parent, comparing SMAs");
- return -bodyA.orbit.semiMajorAxis.CompareTo(bodyB.orbit.semiMajorAxis);
- }
-
- Tools.PostDebugMessage(this, "orbits do not share a parent, carrying on");
-
- if (bodyA.hasAncestor(bodyB))
- {
- Tools.PostDebugMessage(this, "bodyA is a moon or sub-moon of bodyB, returning -1");
- return -1;
- }
- if (bodyB.hasAncestor(bodyA))
- {
- Tools.PostDebugMessage(this, "bodyA is a moon or sub-moon of bodyB, returning 1");
- return 1;
- }
-
- Tools.PostDebugMessage(this, "bodies do not have an obvious relationship, searching for one");
-
- if (VOID_Tools.NearestRelatedParents(ref bodyA, ref bodyB))
- {
- Tools.PostDebugMessage(this, "good relation {0} and {1}, comparing", bodyA.bodyName, bodyB.bodyName);
- return this.Compare(bodyA, bodyB);
- }
-
- Tools.PostDebugMessage(this, "bad relation {0} and {1}, giving up", bodyA.bodyName, bodyB.bodyName);
-
- return 0;
- }
- }
-
public static partial class VOID_Data
{
public static readonly VOID_DoubleValue nominalThrustWeight = new VOID_DoubleValue(
--- a/VOID_Tools.cs
+++ b/VOID_Tools.cs
@@ -29,6 +29,7 @@
using KSP;
using System;
using System.Collections.Generic;
+using ToadicusTools;
using UnityEngine;
namespace VOID
@@ -333,7 +334,11 @@
{
func(id);
}
+ #if DEBUG
catch (ArgumentException ex)
+ #else
+ catch (ArgumentException)
+ #endif
{
Debug.LogWarning(
string.Format("[{0}]: ArgumentException caught during window call.", func.Target.GetType().Name)
@@ -863,6 +868,83 @@
return "";
}
}
+
+ public class CBListComparer : IComparer<CelestialBody>
+ {
+ public int Compare(CelestialBody bodyA, CelestialBody bodyB)
+ {
+ Tools.PostDebugMessage(this, "got bodyA: {0} & bodyB: {1}", bodyA, bodyB);
+
+ if (bodyA == null && bodyB == null)
+ {
+ Tools.PostDebugMessage(this, "both bodies are null, returning 0");
+ return 0;
+ }
+ if (bodyA == null)
+ {
+ Tools.PostDebugMessage(this, "bodyA is null, returning -1");
+ return -1;
+ }
+ if (bodyB == null)
+ {
+ Tools.PostDebugMessage(this, "bodyB is null, returning 1");
+ return 1;
+ }
+
+ Tools.PostDebugMessage(this, "bodies are not null, carrying on");
+
+ if (object.ReferenceEquals(bodyA, bodyB))
+ {
+ Tools.PostDebugMessage(this, "bodies are equal, returning 0");
+ return 0;
+ }
+
+ Tools.PostDebugMessage(this, "bodies are not equal, carrying on");
+
+ if (bodyA.orbitDriver == null)
+ {
+ Tools.PostDebugMessage(this, "bodyA.orbit is null (bodyA is the sun, returning 1");
+ return 1;
+ }
+ if (bodyB.orbitDriver == null)
+ {
+ Tools.PostDebugMessage(this, "bodyB.orbit is null (bodyB is the sun, returning -1");
+ return -1;
+ }
+
+ Tools.PostDebugMessage(this, "orbits are not null, carrying on");
+
+ if (bodyA.orbit.referenceBody == bodyB.orbit.referenceBody)
+ {
+ Tools.PostDebugMessage(this, "bodies share a parent, comparing SMAs");
+ return -bodyA.orbit.semiMajorAxis.CompareTo(bodyB.orbit.semiMajorAxis);
+ }
+
+ Tools.PostDebugMessage(this, "orbits do not share a parent, carrying on");
+
+ if (bodyA.hasAncestor(bodyB))
+ {
+ Tools.PostDebugMessage(this, "bodyA is a moon or sub-moon of bodyB, returning -1");
+ return -1;
+ }
+ if (bodyB.hasAncestor(bodyA))
+ {
+ Tools.PostDebugMessage(this, "bodyA is a moon or sub-moon of bodyB, returning 1");
+ return 1;
+ }
+
+ Tools.PostDebugMessage(this, "bodies do not have an obvious relationship, searching for one");
+
+ if (VOID_Tools.NearestRelatedParents(ref bodyA, ref bodyB))
+ {
+ Tools.PostDebugMessage(this, "good relation {0} and {1}, comparing", bodyA.bodyName, bodyB.bodyName);
+ return this.Compare(bodyA, bodyB);
+ }
+
+ Tools.PostDebugMessage(this, "bad relation {0} and {1}, giving up", bodyA.bodyName, bodyB.bodyName);
+
+ return 0;
+ }
+ }
}
-
--- a/VOID_VesselInfo.cs
+++ b/VOID_VesselInfo.cs
@@ -66,7 +66,9 @@
VOID_Data.totalMass.DoGUIHorizontal ("F3");
- VOID_Data.comboResourceMass.DoGUIHorizontal ();
+ VOID_Data.stageResourceMass.DoGUIHorizontal("F2");
+
+ VOID_Data.resourceMass.DoGUIHorizontal("F2");
VOID_Data.stageDeltaV.DoGUIHorizontal (3, false);
@@ -131,7 +133,7 @@
);
public static readonly VOID_DoubleValue stageResourceMass = new VOID_DoubleValue(
- "Resource Mass (Current Stage)",
+ "Resource Mass (Stage)",
delegate()
{
if (SimManager.LastStage == null)
@@ -148,7 +150,10 @@
"Resource Mass (curr / total)",
delegate()
{
- return string.Format("{0} / {1}", stageResourceMass.ValueUnitString(), resourceMass.ValueUnitString());
+ return string.Format("{0} / {1}",
+ stageResourceMass.ValueUnitString("F3"),
+ resourceMass.ValueUnitString("F3")
+ );
}
);
--- a/VOID_VesselRegister.cs
+++ b/VOID_VesselRegister.cs
@@ -142,7 +142,7 @@
if (_selectedVessel != v)
{
_selectedVessel = v; //set clicked vessel as selected_vessel
- this._Active.value = true; //turn bool on to open the window if closed
+ this.toggleActive = true; //turn bool on to open the window if closed
}
else
{