actually fix warp to next

JonnyOThan · JonnyOThan · commit a1caa9295b05 · 2023-02-14T14:08:11.000-05:00
diff --git a/RasterPropMonitor/Core/RPMCEvaluators.cs b/RasterPropMonitor/Core/RPMCEvaluators.cs
@@ -945,7 +945,7 @@ internal NumericVariableEvaluator GetNumericEvaluator(string input, out Variable
                 case "MNODEBURNTIMESECS":
                     return (RPMVesselComputer comp) =>
                     {
-                        if (node != null && comp.totalLimitedMaximumThrust > 0 && comp.actualAverageIsp > 0.0f)
+                        if (node != null)
                         {
                             return comp.actualAverageIsp * (1.0f - Math.Exp(-node.GetBurnVector(vessel.orbit).magnitude / comp.actualAverageIsp / RPMGlobals.gee)) / (comp.totalLimitedMaximumThrust / (comp.totalShipWetMass * RPMGlobals.gee));
                         }
diff --git a/RasterPropMonitor/Handlers/JSIInternalRPMButtons.cs b/RasterPropMonitor/Handlers/JSIInternalRPMButtons.cs
@@ -1398,7 +1398,8 @@ double GetNextWarpEventTime()
 
             if (vessel.patchedConicSolver != null && vessel.patchedConicSolver.maneuverNodes.Count > 0)
             {
-                targetUT = Planetarium.GetUniversalTime() + vessel.patchedConicSolver.maneuverNodes[0].startBurnIn - GameSettings.WARP_TO_MANNODE_MARGIN;
+                double halfBurnDuration = GetBurnDuration((float)vessel.patchedConicSolver.maneuverNodes[0].DeltaV.magnitude * 0.5f);
+                targetUT = vessel.patchedConicSolver.maneuverNodes[0].UT - halfBurnDuration - GameSettings.WARP_TO_MANNODE_MARGIN;
             }
             else if (vessel.orbit.nextPatch != null && vessel.orbit.nextPatch.activePatch)
             {

Original file line number	Diff line number	Diff line change
`@@ -945,7 +945,7 @@ internal NumericVariableEvaluator GetNumericEvaluator(string input, out Variable`
`945`	`945`	`case "MNODEBURNTIMESECS":`
`946`	`946`	`return (RPMVesselComputer comp) =>`
`947`	`947`	`{`
`948`		`- if (node != null && comp.totalLimitedMaximumThrust > 0 && comp.actualAverageIsp > 0.0f)`
	`948`	`+ if (node != null)`
`949`	`949`	`{`
`950`	`950`	`return comp.actualAverageIsp * (1.0f - Math.Exp(-node.GetBurnVector(vessel.orbit).magnitude / comp.actualAverageIsp / RPMGlobals.gee)) / (comp.totalLimitedMaximumThrust / (comp.totalShipWetMass * RPMGlobals.gee));`
`951`	`951`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1398,7 +1398,8 @@ double GetNextWarpEventTime()`
`1398`	`1398`
`1399`	`1399`	`if (vessel.patchedConicSolver != null && vessel.patchedConicSolver.maneuverNodes.Count > 0)`
`1400`	`1400`	`{`
`1401`		`- targetUT = Planetarium.GetUniversalTime() + vessel.patchedConicSolver.maneuverNodes[0].startBurnIn - GameSettings.WARP_TO_MANNODE_MARGIN;`
	`1401`	`+ double halfBurnDuration = GetBurnDuration((float)vessel.patchedConicSolver.maneuverNodes[0].DeltaV.magnitude * 0.5f);`
	`1402`	`+ targetUT = vessel.patchedConicSolver.maneuverNodes[0].UT - halfBurnDuration - GameSettings.WARP_TO_MANNODE_MARGIN;`
`1402`	`1403`	`}`
`1403`	`1404`	`else if (vessel.orbit.nextPatch != null && vessel.orbit.nextPatch.activePatch)`
`1404`	`1405`	`{`