Use stock lift/mass equations

Crzyrndm · Jun 8, 2015 · dab7ab7 · dab7ab7
1 parent b24a6ce
commit dab7ab7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/B9 PWings Fork/WingProcedural.cs b/B9 PWings Fork/WingProcedural.cs
@@ -2017,30 +2017,27 @@ public void CalculateAerodynamicValues ()
                 DebugLogWithID ("CalculateAerodynamicValues", "Passed cost/force/torque");
 
             // Stock-only values
-
-            if (!assemblyFARUsed || !assemblyFARMass)
-            {
-                if (WPDebug.logCAV)
-                    DebugLogWithID ("CalculateAerodynamicValues", "FAR/NEAR is inactive or FAR mass is not enabled, calculating stock part mass");
-                part.mass = Mathf.Round ((float) aeroStatMass * 100f) / 100f;
-            }
             if (!assemblyFARUsed)
             {
+                float stockLiftCoefficient = (float)aeroStatSurfaceArea / 3.52f;
                 if (!isCtrlSrf && !isWingAsCtrlSrf)
                 {
                     if (WPDebug.logCAV)
                         DebugLogWithID ("CalculateAerodynamicValues", "FAR/NEAR is inactive, calculating values for winglet part type");
-                    ((ModuleLiftingSurface)this.part.Modules["ModuleLiftingSurface"]).deflectionLiftCoeff = (float)Math.Round(aeroStatCl, 2);
+                    ((ModuleLiftingSurface)this.part.Modules["ModuleLiftingSurface"]).deflectionLiftCoeff = (float)Math.Round(stockLiftCoefficient, 2);
+                    part.mass = stockLiftCoefficient * 0.1f;
                 }
                 else
                 {
                     if (WPDebug.logCAV)
                         DebugLogWithID ("CalculateAerodynamicValues", "FAR/NEAR is inactive, calculating stock control surface module values");
                     ModuleControlSurface mCtrlSrf = part.Modules.OfType<ModuleControlSurface> ().FirstOrDefault ();
-                    mCtrlSrf.deflectionLiftCoeff = (float)Math.Round(aeroStatCl, 2);
+                    mCtrlSrf.deflectionLiftCoeff = (float)Math.Round(stockLiftCoefficient, 2);
                     mCtrlSrf.ctrlSurfaceArea = aeroConstControlSurfaceFraction;
+                    part.mass = stockLiftCoefficient * (1 + mCtrlSrf.ctrlSurfaceArea) * 0.1f;
                 }
             }
+
             if (WPDebug.logCAV)
                 DebugLogWithID ("CalculateAerodynamicValues", "Passed stock drag/deflection/area");
 

diff --git a/GameData/B9_Aerospace/Plugins/B9_Aerospace_WingStuff.dll b/GameData/B9_Aerospace/Plugins/B9_Aerospace_WingStuff.dll