VOID_HUD: Moved placeholder methods for advanced HUD to HUDAdvanced.
VOID_HUD: Moved placeholder methods for advanced HUD to HUDAdvanced.

--- a/VOID.csproj
+++ b/VOID.csproj
@@ -93,6 +93,7 @@
     <Compile Include="VOID_Tools.cs" />
     <Compile Include="VOID_Localization.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="VOID_HUDAdvanced.cs" />
   </ItemGroup>
   <ProjectExtensions>
     <MonoDevelop>

--- a/VOID_Core.cs
+++ b/VOID_Core.cs
@@ -1033,7 +1033,7 @@
 		{
 			get
 			{
-				return core.Kerbin.gravParameter / Math.Pow(core.Kerbin.Radius, 2);
+				return core.Kerbin.gravParameter / (core.Kerbin.Radius * core.Kerbin.Radius);
 			}
 		}
 	}

--- a/VOID_HUD.cs
+++ b/VOID_HUD.cs
@@ -269,62 +269,6 @@
 			() => core.vessel.getSurfacePitch(),
 			"°"
 		);
-
-		public static readonly VOID_DoubleValue stageMassFlow = new VOID_DoubleValue(
-			"Stage Mass Flow",
-			delegate()
-			{
-			if (SimManager.LastStage == null)
-				{
-					return double.NaN;
-				}
-
-				double stageIsp = SimManager.LastStage.isp;
-				double stageThrust = SimManager.LastStage.actualThrust;
-
-				return stageThrust / (stageIsp * KerbinGee);
-			},
-			"Mg/s"
-		);
-
-		public static readonly VOID_DoubleValue burnTimeCompleteAtNode = new VOID_DoubleValue(
-			"Full burn time to complete at node",
-			delegate()
-			{
-			if (SimManager.LastStage == null)
-				{
-					return double.NaN;
-				}
-			    
-				double nextManeuverDV = core.vessel.patchedConicSolver.maneuverNodes[0].DeltaV.magnitude;
-				double stageThrust = SimManager.LastStage.actualThrust;
-
-				return burnTime(nextManeuverDV, totalMass, stageMassFlow, stageThrust);
-			},
-			"s"
-		);
-
-		public static readonly VOID_DoubleValue burnTimeHalfDoneAtNode = new VOID_DoubleValue(
-			"Full burn time to be half done at node",
-			delegate()
-			{
-				if (SimManager.LastStage == null)
-				{
-					return double.NaN;
-				}
-			    
-				double nextManeuverDV = core.vessel.patchedConicSolver.maneuverNodes[0].DeltaV.magnitude / 2d;
-				double stageThrust = SimManager.LastStage.actualThrust;
-
-				return burnTime(nextManeuverDV, totalMass, stageMassFlow, stageThrust);
-			},
-			"s"
-		);
-
-		private static double burnTime(double deltaV, double initialMass, double massFlow, double thrust)
-		{
-			return initialMass / massFlow * (Math.Exp(deltaV * massFlow / thrust) - 1d);
-		}
 	}
 }
 

--- /dev/null
+++ b/VOID_HUDAdvanced.cs
@@ -1,1 +1,566 @@
-
+// VOID
+//
+// VOID_HUD.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 Engineer.VesselSimulator;
+using KSP;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using ToadicusTools;
+using UnityEngine;
+
+namespace VOID
+{
+	public class VOID_HUDAdvanced : VOID_Module, IVOID_Module
+	{
+		/*
+		 * Fields
+		 * */
+		protected VOID_HUD primaryHUD;
+
+		protected Rect leftHUDdefaultPos;
+		protected Rect rightHUDdefaultPos;
+
+		[AVOID_SaveValue("leftHUDPos")]
+		protected VOID_SaveValue<Rect> leftHUDPos;
+		[AVOID_SaveValue("rightHUDPos")]
+		protected VOID_SaveValue<Rect> rightHUDPos;
+
+		[AVOID_SaveValue("positionsLocked")]
+		protected VOID_SaveValue<bool> positionsLocked;
+
+		/*
+		 * Properties
+		 * */
+		public int ColorIndex
+		{
+			get
+			{
+				if (this.primaryHUD == null)
+				{
+					return 0;
+				}
+
+				return this.primaryHUD.ColorIndex;
+			}
+		}
+
+		/* 
+		 * Methods
+		 * */
+		public VOID_HUDAdvanced() : base()
+		{
+			this._Name = "Advanced Heads-Up Display";
+
+			this._Active.value = true;
+
+			this.leftHUDdefaultPos = new Rect(Screen.width * .375f - 300f, Screen.height * .5f, 300f, 90f);
+			this.leftHUDPos = new Rect(this.leftHUDdefaultPos);
+
+			this.rightHUDdefaultPos = new Rect(Screen.width * .625f, Screen.height * .5f, 300f, 90f);
+			this.rightHUDPos = new Rect(this.rightHUDdefaultPos);
+
+			this.positionsLocked = true;
+
+			Tools.PostDebugMessage (this, "Constructed.");
+		}
+
+		protected void leftHUDWindow(int id)
+		{
+			StringBuilder leftHUD;
+
+			leftHUD = new StringBuilder();
+
+			VOID_Core.Instance.LabelStyles["hud"].alignment = TextAnchor.UpperRight;
+
+			if (VOID_Core.Instance.powerAvailable)
+			{
+				leftHUD.AppendFormat(
+					string.Intern("Mass: {0}\n"),
+					VOID_Data.totalMass.ToSIString(2)
+				);
+
+				if (VOID_Data.vesselCrewCapacity > 0)
+				{
+					leftHUD.AppendFormat(
+						string.Intern("Crew: {0} / {1}\n"),
+						VOID_Data.vesselCrewCount.Value,
+						VOID_Data.vesselCrewCapacity.Value
+					);
+				}
+
+				leftHUD.AppendFormat(
+					string.Intern("Acc: {0} T:W: {1}\n"),
+					VOID_Data.vesselAccel.ToSIString(2),
+					VOID_Data.currThrustWeight.Value.ToString("f2")
+				);
+
+				leftHUD.AppendFormat(
+					string.Intern("Ang Vel: {0}"),
+					VOID_Data.vesselAngularVelocity.ToSIString(2)
+				);
+			}
+			else
+			{
+				VOID_Core.Instance.LabelStyles["hud"].normal.textColor = Color.red;
+				leftHUD.Append(string.Intern("-- POWER LOST --"));
+			}
+
+			GUILayout.Label(leftHUD.ToString(), VOID_Core.Instance.LabelStyles["hud"], GUILayout.ExpandWidth(true));
+
+			if (!this.positionsLocked)
+			{
+				GUI.DragWindow();
+			}
+
+			GUI.BringWindowToBack(id);
+		}
+
+		protected void rightHUDWindow(int id)
+		{
+			StringBuilder rightHUD;
+
+			rightHUD = new StringBuilder();
+
+			VOID_Core.Instance.LabelStyles["hud"].alignment = TextAnchor.UpperLeft;
+
+			if (VOID_Core.Instance.powerAvailable)
+			{
+				rightHUD.AppendFormat(
+					"Burn Δv (Rem/Tot): {0} / {1}\n",
+					VOID_Data.currManeuverDVRemaining.ValueUnitString("f2"),
+					VOID_Data.currManeuverDeltaV.ValueUnitString("f2")
+				);
+
+				if (VOID_Data.upcomingManeuverNodes > 1)
+				{
+					rightHUD.AppendFormat("Next Burn Δv: {0}\n",
+						VOID_Data.nextManeuverDeltaV.ValueUnitString("f2")
+					);
+				}
+
+				rightHUD.AppendFormat("Burn Time (Rem/Total): {0} / {1}\n",
+					VOID_Tools.ConvertInterval(VOID_Data.currentNodeBurnRemaining.Value),
+					VOID_Tools.ConvertInterval(VOID_Data.currentNodeBurnDuration.Value)
+				);
+
+				rightHUD.AppendFormat("Start T - {0} (done @ node)\n",
+					VOID_Data.burnTimeDoneAtNode.Value
+				);
+
+				rightHUD.AppendFormat("Start T - {0} (½ done @ node)",
+					VOID_Data.burnTimeHalfDoneAtNode.Value
+				);
+			}
+			else
+			{
+				VOID_Core.Instance.LabelStyles["hud"].normal.textColor = Color.red;
+				rightHUD.Append(string.Intern("-- POWER LOST --"));
+			}
+
+			GUILayout.Label(rightHUD.ToString(), VOID_Core.Instance.LabelStyles["hud"], GUILayout.ExpandWidth(true));
+
+			if (!this.positionsLocked)
+			{
+				GUI.DragWindow();
+			}
+
+			GUI.BringWindowToBack(id);
+		}
+
+		public override void DrawGUI()
+		{
+			if (this.primaryHUD == null)
+			{
+				foreach (IVOID_Module module in VOID_Core.Instance.Modules)
+				{
+					if (module is VOID_HUD)
+					{
+						this.primaryHUD = module as VOID_HUD;
+					}
+				}
+			}
+			else
+			{
+				if ((TimeWarp.WarpMode == TimeWarp.Modes.LOW) || (TimeWarp.CurrentRate <= TimeWarp.MaxPhysicsRate))
+				{
+					SimManager.RequestSimulation();
+				}
+
+				this.leftHUDPos.value = GUI.Window(
+					VOID_Core.Instance.windowID,
+					this.leftHUDPos,
+					this.leftHUDWindow,
+					GUIContent.none,
+					GUIStyle.none
+				);
+
+				if (VOID_Data.upcomingManeuverNodes > 0)
+				{
+					this.rightHUDPos.value = GUI.Window(
+						VOID_Core.Instance.windowID,
+						this.rightHUDPos,
+						this.rightHUDWindow,
+						GUIContent.none,
+						GUIStyle.none
+					);
+				}
+			}
+		}
+
+		public override void DrawConfigurables()
+		{
+			this.positionsLocked = GUILayout.Toggle(this.positionsLocked,
+				string.Intern("Lock HUDAdvanced Positions"),
+				GUILayout.ExpandWidth(false));
+		}
+	}
+
+	public static partial class VOID_Data
+	{
+		public static int upcomingManeuverNodes
+		{
+			get
+			{
+				if (core.vessel == null ||
+					core.vessel.patchedConicSolver == null ||
+					core.vessel.patchedConicSolver.maneuverNodes == null
+				)
+				{
+					return 0;
+				}
+
+				return core.vessel.patchedConicSolver.maneuverNodes.Count;
+			}
+		}
+
+		public static readonly VOID_DoubleValue vesselThrustOffset = new VOID_DoubleValue(
+			"Thrust Offset",
+			delegate()
+		{
+			if (core.vessel == null)
+			{
+				return double.NaN;
+			}
+
+			List<PartModule> engineModules = core.vessel.getModulesOfType<PartModule>();
+
+			Vector3d thrustPos = Vector3d.zero;
+			Vector3d thrustDir = Vector3d.zero;
+			double thrust = 0;
+
+			foreach (PartModule engine in engineModules)
+			{
+				switch (engine.moduleName)
+				{
+					case "ModuleEngines":
+					case "ModuleEnginesFX":
+						break;
+					default:
+						continue;
+				}
+
+				if (!engine.isEnabled)
+				{
+					continue;
+				}
+
+				CenterOfThrustQuery cotQuery = new CenterOfThrustQuery();
+
+				if (engine is ModuleEngines)
+				{
+					ModuleEngines engineModule = engine as ModuleEngines;
+
+					engineModule.OnCenterOfThrustQuery(cotQuery);
+				}
+				else // engine is ModuleEnginesFX
+				{
+					ModuleEnginesFX engineFXModule = engine as ModuleEnginesFX;
+
+					engineFXModule.OnCenterOfThrustQuery(cotQuery);
+				}
+
+				thrustPos += cotQuery.pos * cotQuery.thrust;
+				thrustDir += cotQuery.dir * cotQuery.thrust;
+				thrust += cotQuery.thrust;
+			}
+
+			if (thrust > 0)
+			{
+				thrustPos /= thrust;
+				thrustDir /= thrust;
+			}
+		},
+			"m"
+		);
+
+		public static readonly VOID_DoubleValue vesselAccel = new VOID_DoubleValue(
+			"Acceleration",
+			() => geeForce * KerbinGee,
+			"m/s"
+		);
+
+		public static readonly VOID_IntValue vesselCrewCount = new VOID_IntValue(
+			"Crew Onboard",
+			delegate()
+			{
+				if (core.vessel != null)
+				{
+					return core.vessel.GetCrewCount();
+				}
+				else
+				{
+					return 0;
+				}
+			},
+			""
+		);
+
+		public static readonly VOID_IntValue vesselCrewCapacity = new VOID_IntValue(
+			"Crew Capacity",
+			delegate()
+		{
+			if (core.vessel != null)
+			{
+				return core.vessel.GetCrewCapacity();
+			}
+			else
+			{
+				return 0;
+			}
+		},
+			""
+		);
+
+		public static readonly VOID_DoubleValue vesselAngularVelocity = new VOID_DoubleValue(
+			"Angular Velocity",
+			delegate()
+		{
+			if (core.vessel != null)
+			{
+				return core.vessel.angularVelocity.magnitude;
+			}
+			else
+			{
+				return double.NaN;
+			}
+		},
+			"rad/s"
+		);
+
+		public static readonly VOID_DoubleValue stageNominalThrust = new VOID_DoubleValue(
+			"Nominal Stage Thrust",
+			delegate()
+		{
+			if (SimManager.LastStage == null)
+			{
+				return double.NaN;
+			}
+
+			if (SimManager.LastStage.actualThrust == 0d)
+			{
+				return SimManager.LastStage.thrust;
+			}
+			else
+			{
+				return SimManager.LastStage.actualThrust;
+			}
+		},
+			"kN"
+		);
+
+		public static readonly VOID_DoubleValue stageMassFlow = new VOID_DoubleValue(
+			"Stage Mass Flow",
+			delegate()
+			{
+				if (SimManager.LastStage == null)
+				{
+					return double.NaN;
+				}
+
+			double stageIsp = SimManager.LastStage.isp;
+			double stageThrust = stageNominalThrust;
+
+			Tools.PostDebugMessage(typeof(VOID_Data), "calculating stageMassFlow from:\n" +
+				"\tstageIsp: {0}\n" +
+				"\tstageThrust: {1}\n" +
+				"\tKerbinGee: {2}\n",
+				stageIsp,
+				stageThrust,
+				KerbinGee
+			);
+
+				return stageThrust / (stageIsp * KerbinGee);
+			},
+			"Mg/s"
+		);
+
+		public static readonly VOID_DoubleValue currManeuverDeltaV = new VOID_DoubleValue(
+			"Current Maneuver Delta-V",
+			delegate()
+			{
+				if (upcomingManeuverNodes > 0)
+				{
+				return core.vessel.patchedConicSolver.maneuverNodes[0].DeltaV.magnitude;
+				}
+				else
+				{
+					return double.NaN;
+				}
+			},
+			"m/s"
+		);
+
+		public static readonly VOID_DoubleValue currManeuverDVRemaining = new VOID_DoubleValue(
+			"Remaining Maneuver Delta-V",
+			delegate()
+			{
+				if (upcomingManeuverNodes > 0)
+				{
+					return core.vessel.patchedConicSolver.maneuverNodes[0].GetBurnVector(core.vessel.orbit).magnitude;
+				}
+				else
+				{
+					return double.NaN;
+				}
+			},
+			"m/s"
+		);
+
+		public static readonly VOID_DoubleValue nextManeuverDeltaV = new VOID_DoubleValue(
+			"Current Maneuver Delta-V",
+			delegate()
+		{
+			if (upcomingManeuverNodes > 1)
+			{
+				return core.vessel.patchedConicSolver.maneuverNodes[1].DeltaV.magnitude;
+			}
+			else
+			{
+				return double.NaN;
+			}
+		},
+			"m/s"
+		);
+
+		public static readonly VOID_DoubleValue currentNodeBurnDuration = new VOID_DoubleValue(
+			"Total Burn Time",
+			delegate()
+			{
+				if (SimManager.LastStage == null || currManeuverDeltaV.Value == double.NaN)
+				{
+					return double.NaN;
+				}
+			    
+				double stageThrust = stageNominalThrust;
+
+				return burnTime(currManeuverDeltaV.Value, totalMass, stageMassFlow, stageThrust);
+			},
+			"s"
+		);
+
+		public static readonly VOID_DoubleValue currentNodeBurnRemaining = new VOID_DoubleValue(
+			"Burn Time Remaining",
+			delegate()
+			{
+				if (SimManager.LastStage == null || currManeuverDVRemaining == double.NaN)
+				{
+					return double.NaN;
+				}
+
+				double stageThrust = stageNominalThrust;
+
+				return burnTime(currManeuverDVRemaining, totalMass, stageMassFlow, stageThrust);
+			},
+			"s"
+		);
+
+		public static readonly VOID_DoubleValue currentNodeHalfBurnDuration = new VOID_DoubleValue(
+			"Half Burn Time",
+			delegate()
+		{
+			if (SimManager.LastStage == null || currManeuverDeltaV.Value == double.NaN)
+			{
+				return double.NaN;
+			}
+
+			double stageThrust = stageNominalThrust;
+
+			return burnTime(currManeuverDeltaV.Value / 2d, totalMass, stageMassFlow, stageThrust);
+		},
+			"s"
+		);
+
+		public static readonly VOID_StrValue burnTimeDoneAtNode = new VOID_StrValue(
+			"Full burn time to be half done at node",
+			delegate()
+		{
+			if (SimManager.LastStage == null && upcomingManeuverNodes < 1)
+			{
+				return "N/A";
+			}
+
+			ManeuverNode node = core.vessel.patchedConicSolver.maneuverNodes[0];
+
+			return VOID_Tools.ConvertInterval((node.UT - currentNodeBurnDuration) - Planetarium.GetUniversalTime());
+		}
+		);
+
+		public static readonly VOID_StrValue burnTimeHalfDoneAtNode = new VOID_StrValue(
+			"Full burn time to be half done at node",
+			delegate()
+			{
+				if (SimManager.LastStage == null && upcomingManeuverNodes < 1)
+				{
+					return "N/A";
+				}
+
+				ManeuverNode node = core.vessel.patchedConicSolver.maneuverNodes[0];
+
+			return VOID_Tools.ConvertInterval((node.UT - currentNodeHalfBurnDuration) - Planetarium.GetUniversalTime());
+			}
+		);
+
+		private static double burnTime(double deltaV, double initialMass, double massFlow, double thrust)
+		{
+			Tools.PostDebugMessage(typeof(VOID_Data), "calculating burnTime from:\n" +
+				"\tdeltaV: {0}\n" +
+				"\tinitialMass: {1}\n" +
+				"\tmassFlow: {2}\n" +
+				"\tthrust: {3}\n",
+				deltaV,
+				initialMass,
+				massFlow,
+				thrust
+			);
+			return initialMass / massFlow * (Math.Exp(deltaV * massFlow / thrust) - 1d);
+		}
+	}
+}
+

--- a/VOID_Module.cs
+++ b/VOID_Module.cs
@@ -51,6 +51,14 @@
 		/*
 		 * Properties
 		 * */
+		protected virtual VOID_Core core
+		{
+			get
+			{
+				return VOID_Core.Instance;
+			}
+		}
+
 		public virtual bool toggleActive
 		{
 			get

--- a/VOID_Tools.cs
+++ b/VOID_Tools.cs
@@ -303,9 +303,11 @@
 
 			seconds %= SecondsPerMinute;
 
-			string format_1 = "{0:D1}y {1:D1}d {2:D2}h {3:D2}m {4:00.0}s";
-			string format_2 = "{0:D1}d {1:D2}h {2:D2}m {3:00.0}s";
-			string format_3 = "{0:D2}h {1:D2}m {2:00.0}s";
+			string format_1 = string.Intern("{0:D1}y {1:D1}d {2:D2}h {3:D2}m {4:00.0}s");
+			string format_2 = string.Intern("{0:D1}d {1:D2}h {2:D2}m {3:00.0}s");
+			string format_3 = string.Intern("{0:D2}h {1:D2}m {2:00.0}s");
+			string format_4 = string.Intern("{0:D2}m {1:00.0}s");
+			string format_5 = string.Intern("{0:00.0}s");
 
 			if (years > 0)
 			{
@@ -315,9 +317,17 @@
 			{
 				return string.Format(format_2, days, hours, minutes, seconds);
 			}
+			else if (hours > 0)
+			{
+				return string.Format(format_3, hours, minutes, seconds);
+			}
+			else if (minutes > 0)
+			{
+				return string.Format(format_4, minutes, seconds);
+			}
 			else
 			{
-				return string.Format(format_3, hours, minutes, seconds);
+				return string.Format(format_5, seconds);
 			}
 		}
 

--- a/VOID_VesselInfo.cs
+++ b/VOID_VesselInfo.cs
@@ -178,6 +178,34 @@
 			}
 		);
 
+		public static readonly VOID_DoubleValue currThrustWeight = new VOID_DoubleValue(
+			"T:W Ratio",
+			delegate()
+		{
+			if (SimManager.LastStage == null)
+			{
+				return double.NaN;
+			}
+
+			return SimManager.LastStage.actualThrustToWeight;
+		},
+			""
+		);
+
+		public static readonly VOID_DoubleValue maxThrustWeight = new VOID_DoubleValue(
+			"T:W Ratio",
+			delegate()
+		{
+			if (SimManager.LastStage == null)
+			{
+				return double.NaN;
+			}
+
+			return SimManager.LastStage.maxThrustToWeight;
+		},
+			""
+		);
+
 		public static readonly VOID_StrValue currmaxThrustWeight = new VOID_StrValue(
 			"T:W (curr/max)",
 			delegate()
@@ -185,20 +213,10 @@
 				if (SimManager.Stages == null || SimManager.LastStage == null)
 					return "N/A";
 
-				double currThrust = SimManager.LastStage.actualThrust;
-				double maxThrust = SimManager.LastStage.thrust;
-				double mass = SimManager.LastStage.totalMass;
-				double gravity = VOID_Core.Instance.vessel.mainBody.gravParameter /
-					Math.Pow(
-						VOID_Core.Instance.vessel.mainBody.Radius + VOID_Core.Instance.vessel.altitude,
-						2
-					);
-				double weight = mass * gravity;
-
 				return string.Format(
 					"{0} / {1}",
-					(currThrust / weight).ToString("F2"),
-					(maxThrust / weight).ToString("F2")
+					(VOID_Data.currThrustWeight.Value).ToString("F2"),
+					(VOID_Data.maxThrustWeight.Value).ToString("F2")
 				);
 			}
 		);