v4.1 FINAL fix thrusterPower bug, add fullThrustMin

Fixes bug in thrust force, allows semi-fullThrust mode (clamp below
which fullThrust doesn't engage).

Author: NathanKell

ModuleRCSFX/Plugins/ModuleRCSFX.dll

@@ -19,7 +19,7 @@ which, when set to true, means that RCS will fire forwards with the throttle.
 
 
 ** RCS Thrust Control **
-fullThrust defaults to false. Set it to true and RCS will always fire at full thrust (or 10% thrust in precision mode), rather than the less-than-full-thrust, dependent-on-angle they do stock.
+fullThrust defaults to false. Set it to true and if the thrust ratio is > fullThrustMin (default: 0.2) RCS will fire at full thrust (or 10% thrust in precision mode), rather than the less-than-full-thrust, dependent-on-angle they do stock.
 
 useLever defaults to false. When it's false, fine controls will make RCS fire at 10% (default) power only. When it's set to true, stock behavior returns (i.e. fine controls means lever arm compensation).
 
@@ -39,6 +39,10 @@ LICENSE remains the ialdabaoth license (CC-BY-SA + tweaks).
 SOURCE is https://github.com/NathanKell/ModuleRCSFX
 
 CHANGELOG
+v4.1
+* Fix bug with fuel consumption and thrust (thrusterPower wasn't being applied right)
+* When in fullThrust mode, don't switch to full thrust unless thrust ratio already starts out at fullThrustMin (configurable).
+
 v4.0
 * Update to KSP 1.0.
 * Speed improvements. (Death to foreach! Don't recalculate values!)

ModuleRCSFX/Readme_MRCSFX.txt

@@ -11,6 +11,12 @@ public class ModuleRCSFX : ModuleRCS
     [KSPField]
     public bool fullThrust = false; // always use full thrust
 
+    /// <summary>
+    /// If fullThrust = true, if thrust ratio is < this, do not apply full thrust (leave thrust unchanged)
+    /// </summary>
+    [KSPField]
+    public float fullThrustMin = 0.2f; // if thrust amount from dots < this, don't do full thrust
+
     [KSPField]
     public bool useEffects = false;
 
@@ -250,7 +256,7 @@ public override void OnStart(StartState state)
 
                         if (thrust > 0f)
                         {
-                            if (fullThrust)
+                            if (fullThrust && thrust >= fullThrustMin)
                                 thrust = 1f;
 
                             if (precision)
@@ -276,7 +282,8 @@ public override void OnStart(StartState state)
 
                             if (success)
                             {
-                                curThrust += thrust;
+                                thrustForce *= thrusterPower;
+                                curThrust += thrustForce;
                                 thrustForces.Add(thrustForce);
                                 if (!isJustForShow)
                                 {
@@ -333,12 +340,12 @@ private void UpdatePropellantStatus()
 
     new public float CalculateThrust(float totalForce, out bool success)
     {
-		double massFlow = flowMult * fuelFlow * (double)totalForce * TimeWarp.fixedDeltaTime;
+        double massFlow = flowMult * fuelFlow * (double)totalForce;
 
         double propAvailable = 1.0d;
 
 		if (!CheatOptions.InfiniteRCS)
-            propAvailable = RequestPropellant(massFlow);
+            propAvailable = RequestPropellant(massFlow * thrusterPower * TimeWarp.fixedDeltaTime);
 
         totalForce = (float)(massFlow * exhaustVel * propAvailable);
 

Source/ModuleRCSFX.cs

@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.4.*")]
-[assembly: AssemblyFileVersion("0.4.0.0")]
+[assembly: AssemblyFileVersion("0.4.1.0")]