Skip to content

Commit

Permalink
Use propellantStability directly
Browse files Browse the repository at this point in the history 
This lets the ThrustController and NodeExecutor use the 0.996 to 1.0
range as where to apply RCS to get back up to 1.0

Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
  • Loading branch information
@lamont-granquist
lamont-granquist committed Nov 8, 2023
1 parent de9691b commit 586dc2c
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 137 deletions.
2 changes: 1 addition & 1 deletion MechJeb2/MechJebModuleNodeExecutor.cs
View file
Expand Up @@ -134,7 +134,7 @@ private void DoRCS(FlightCtrlState s)
if (State != States.LEAD || RCSOnly)
return;

if (!Core.Thrust.AutoRCSUllaging || VesselState.lowestUllage == VesselState.UllageState.VeryStable)
if (!Core.Thrust.AutoRCSUllaging || VesselState.lowestUllage >= 1.0)
return;

if (!Vessel.hasEnabledRCSModules())
Expand Down
6 changes: 3 additions & 3 deletions MechJeb2/MechJebModuleThrustController.cs
View file
Expand Up @@ -531,7 +531,7 @@ public override void Drive(FlightCtrlState s)
/* prevent unstable ignitions */
if (LimitToPreventUnstableIgnition && s.mainThrottle > 0.0F && ThrottleLimit > 0.0F)
{
if (VesselState.lowestUllage < VesselState.UllageState.Stable)
if (VesselState.lowestUllage < 0.95) // needs to match 'unstable' value in RF
{
ScreenMessages.PostScreenMessage(_preventingUnstableIgnitionsMessage);
Debug.Log("MechJeb Unstable Ignitions: preventing ignition in state: " + VesselState.lowestUllage);
Expand Down Expand Up @@ -886,10 +886,10 @@ private void ProcessUllage(FlightCtrlState s)
if (!Vessel.hasEnabledRCSModules())
return;

if (VesselState.lowestUllage == VesselState.UllageState.VeryStable && VesselState.time > _ullageUntil)
if (VesselState.lowestUllage >= 1.0 && VesselState.time > _ullageUntil)
return;

if (VesselState.lowestUllage != VesselState.UllageState.VeryStable)
if (VesselState.lowestUllage < 1.0)
_ullageUntil = VesselState.time + MIN_RCS_TIME;

// limit the throttle only if we aren't already burning (don't waste ignitions)
Expand Down
2 changes: 1 addition & 1 deletion MechJeb2/PartExtensions.cs
View file
Expand Up @@ -57,7 +57,7 @@ public static bool UnstableUllage(this Part p)
return false;
if (VesselState.RFullageSetField.GetValue(eng) is object ullageSet)
if (VesselState.RFGetUllageStabilityMethod.Invoke(ullageSet, Array.Empty<object>()) is double propellantStability)
if (propellantStability < VesselState.RFveryStableValue)
if (propellantStability < 0.996)
return true;
}
catch (ArgumentException)
Expand Down
137 changes: 5 additions & 132 deletions MechJeb2/VesselState.cs
View file
Expand Up @@ -30,25 +30,8 @@ public class VesselState
// RealFuels.Ullage.UllageSet GetUllageStability method to call via reflection
public static MethodInfo RFGetUllageStabilityMethod;

// RealFuels.Ullage.UllageSimulator fields to determine ullage status
public static double RFveryStableValue;
private static double RFstableValue;
private static double RFriskyValue;
private static double RFveryRiskyValue;
private static double RFunstableValue;

public enum UllageState
{
VeryUnstable,
Unstable,
VeryRisky,
Risky,
Stable,
VeryStable // "Nominal" also winds up here
}

// lowestUllage is always VeryStable without RealFuels installed
public UllageState lowestUllage => einfo.lowestUllage;
public double lowestUllage => einfo.lowestUllage;

public static bool isLoadedFAR;

Expand Down Expand Up @@ -418,103 +401,6 @@ public void InitReflection()
isLoadedRealFuels = false;
}

FieldInfo RFveryStableField = ReflectionUtils.GetFieldByReflection("RealFuels", "RealFuels.Ullage.UllageSimulator", "veryStable",
BindingFlags.NonPublic | BindingFlags.Static);
if (RFveryStableField == null)
{
Debug.Log("MechJeb BUG: RealFuels loaded, but RealFuels.Ullage.UllageSimulator has no veryStable field, disabling RF");
isLoadedRealFuels = false;
}

try
{
RFveryStableValue = (double)RFveryStableField.GetValue(null);
}
catch (Exception e1)
{
Debug.Log(
"MechJeb BUG Exception thrown while getting veryStable value from RealFuels, ullage integration disabled: " + e1.Message);
isLoadedRealFuels = false;
return;
}

FieldInfo RFstableField = ReflectionUtils.GetFieldByReflection("RealFuels", "RealFuels.Ullage.UllageSimulator", "stable",
BindingFlags.NonPublic | BindingFlags.Static);
if (RFstableField == null)
{
Debug.Log("MechJeb BUG: RealFuels loaded, but RealFuels.Ullage.UllageSimulator has no stable field, disabling RF");
isLoadedRealFuels = false;
}

try
{
RFstableValue = (double)RFstableField.GetValue(null);
}
catch (Exception e2)
{
Debug.Log("MechJeb BUG Exception thrown while getting stable value from RealFuels, ullage integration disabled: " + e2.Message);
isLoadedRealFuels = false;
return;
}

FieldInfo RFriskyField = ReflectionUtils.GetFieldByReflection("RealFuels", "RealFuels.Ullage.UllageSimulator", "risky",
BindingFlags.NonPublic | BindingFlags.Static);
if (RFriskyField == null)
{
Debug.Log("MechJeb BUG: RealFuels loaded, but RealFuels.Ullage.UllageSimulator has no risky field, disabling RF");
isLoadedRealFuels = false;
}

try
{
RFriskyValue = (double)RFriskyField.GetValue(null);
}
catch (Exception e3)
{
Debug.Log("MechJeb BUG Exception thrown while getting risky value from RealFuels, ullage integration disabled: " + e3.Message);
isLoadedRealFuels = false;
return;
}

FieldInfo RFveryRiskyField = ReflectionUtils.GetFieldByReflection("RealFuels", "RealFuels.Ullage.UllageSimulator", "veryRisky",
BindingFlags.NonPublic | BindingFlags.Static);
if (RFveryRiskyField == null)
{
Debug.Log("MechJeb BUG: RealFuels loaded, but RealFuels.Ullage.UllageSimulator has no veryRisky field, disabling RF");
isLoadedRealFuels = false;
}

try
{
RFveryRiskyValue = (double)RFveryRiskyField.GetValue(null);
}
catch (Exception e4)
{
Debug.Log("MechJeb BUG Exception thrown while getting veryRisky value from RealFuels, ullage integration disabled: " +
e4.Message);
isLoadedRealFuels = false;
return;
}

FieldInfo RFunstableField = ReflectionUtils.GetFieldByReflection("RealFuels", "RealFuels.Ullage.UllageSimulator", "unstable",
BindingFlags.NonPublic | BindingFlags.Static);
if (RFunstableField == null)
{
Debug.Log("MechJeb BUG: RealFuels loaded, but RealFuels.Ullage.UllageSimulator has no unstable field, disabling RF");
isLoadedRealFuels = false;
}

try
{
RFunstableValue = (double)RFunstableField.GetValue(null);
}
catch (Exception e5)
{
Debug.Log("MechJeb BUG Exception thrown while getting unstable value from RealFuels, ullage integration disabled: " + e5.Message);
isLoadedRealFuels = false;
return;
}

if (isLoadedRealFuels)
{
Debug.Log("MechJeb: RealFuels Assembly is wired up properly");
Expand Down Expand Up @@ -1497,7 +1383,7 @@ public class EngineInfo
public readonly Vector6 torqueDiffThrottle = new Vector6();

// lowestUllage is always VeryStable without RealFuels installed
public UllageState lowestUllage = UllageState.VeryStable;
public double lowestUllage;

public struct FuelRequirement
{
Expand All @@ -1523,7 +1409,7 @@ public void Update(Vector3d c, Vessel vessel)

resourceRequired.Clear();

lowestUllage = UllageState.VeryStable;
lowestUllage = 1.0;

CoM = c;

Expand Down Expand Up @@ -1623,22 +1509,9 @@ public void CheckUllageStatus(ModuleEngines e)
return;
}

UllageState propellantState;

if (propellantStability >= RFveryStableValue)
propellantState = UllageState.VeryStable;
else if (propellantStability >= RFstableValue)
propellantState = UllageState.Stable;
else if (propellantStability >= RFriskyValue)
propellantState = UllageState.Risky;
else if (propellantStability >= RFveryRiskyValue)
propellantState = UllageState.VeryRisky;
else
propellantState = UllageState.Unstable;

if (propellantState < lowestUllage)
if (propellantStability < lowestUllage)
{
lowestUllage = propellantState;
lowestUllage = propellantStability;
}
}

Expand Down

0 comments on commit 586dc2c

Please sign in to comment.