Merge remote-tracking branch 'warrenseymour/develop' into develop #closes

Author: Chris Woerz

GameData/RemoteTech2/Textures/TimeQuadrantFcStatus.png

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -12,15 +12,22 @@ public class ManeuverCommand : AbstractCommand
         public double OriginalDelta { get; set; }
         public double RemainingTime { get; set; }
         public double RemainingDelta { get; set; }
+        public bool EngineActivated { get; set; }
         public override int Priority { get { return 0; } }
 
         public override string Description
         {
             get
             {
                 if (RemainingTime > 0 || RemainingDelta > 0)
-                    return "Executing maneuver: " + RemainingDelta.ToString("F2") + "m/s" + Environment.NewLine +
-                           "Remaining duration: " + RTUtil.FormatDuration(RemainingTime) + Environment.NewLine + base.Description;
+                {
+                    string flightInfo = "Executing maneuver: " + RemainingDelta.ToString("F2") +
+                                        "m/s" + Environment.NewLine + "Remaining duration: ";
+
+                    flightInfo += EngineActivated ? RTUtil.FormatDuration(RemainingTime) : "-:-";
+
+                    return flightInfo + Environment.NewLine + base.Description;
+                }
                 else
                     return "Execute planned maneuver" + Environment.NewLine + base.Description;
             }
@@ -29,10 +36,22 @@ public override string Description
         public override bool Pop(FlightComputer f)
         {
             var burn = f.ActiveCommands.FirstOrDefault(c => c is BurnCommand);
-            if (burn != null) f.Remove(burn);
+            if (burn != null) {
+                f.Remove (burn);
+            }
+
             OriginalDelta = Node.DeltaV.magnitude;
             RemainingDelta = Node.GetBurnVector(f.Vessel.orbit).magnitude;
-            RemainingTime = RemainingDelta / (FlightCore.GetTotalThrust(f.Vessel) / f.Vessel.GetTotalMass());
+            EngineActivated = true;
+
+            double thrustToMass = FlightCore.GetTotalThrust(f.Vessel) / f.Vessel.GetTotalMass();
+            if (thrustToMass == 0.0) {
+                EngineActivated = false;
+                RTUtil.ScreenMessage("[Flight Computer]: No engine to carry out the maneuver.");
+            } else {
+                RemainingTime = RemainingDelta / thrustToMass;
+            }
+
             return true;
         }
 
@@ -44,17 +63,32 @@ public override bool Execute(FlightComputer f, FlightCtrlState fcs)
                 var up = (f.SignalProcessor.Body.position - f.SignalProcessor.Position).normalized;
                 var orientation = Quaternion.LookRotation(forward, up);
                 FlightCore.HoldOrientation(fcs, f, orientation);
+
+                double thrustToMass = (FlightCore.GetTotalThrust(f.Vessel) / f.Vessel.GetTotalMass());
+                if (thrustToMass == 0.0) {
+                    EngineActivated = false;
+                    return false;
+                }
+
+                EngineActivated = true;
                 fcs.mainThrottle = 1.0f;
-                RemainingTime -= TimeWarp.deltaTime;
-                RemainingDelta -= (FlightCore.GetTotalThrust(f.Vessel) / f.Vessel.GetTotalMass()) * TimeWarp.deltaTime;
+                RemainingTime = RemainingDelta / thrustToMass;
+                RemainingDelta -= thrustToMass * TimeWarp.deltaTime;
                 return false;
             }
             f.Enqueue(AttitudeCommand.Off(), true, true, true);
             return true;
         }
 
-        public static ManeuverCommand WithNode(ManeuverNode node)
+        public static ManeuverCommand WithNode(ManeuverNode node, FlightComputer f)
         {
+            double thrust = FlightCore.GetTotalThrust(f.Vessel);
+            double advance = f.Delay;
+
+            if (thrust > 0) {
+                advance += (node.DeltaV.magnitude / (thrust / f.Vessel.GetTotalMass())) / 2;
+            }
+
             var newNode = new ManeuverCommand()
             {
                 Node = new ManeuverNode()
@@ -67,7 +101,7 @@ public static ManeuverCommand WithNode(ManeuverNode node)
                     UT = node.UT,
                     nodeRotation = node.nodeRotation,
                 },
-                TimeStamp = node.UT,
+                TimeStamp = node.UT - advance,
             };
             return newNode;
         }

GameData/RemoteTech2/Textures/texFlightGreen.png

@@ -13,7 +13,8 @@ public override String Description
         {
             get
             {
-                return BaseEvent.listParent.part.partInfo.title + ": " + BaseEvent.GUIName;
+                return BaseEvent.listParent.part.partInfo.title + ": " +
+                       BaseEvent.GUIName + Environment.NewLine + base.Description;
             }
         }