Merge pull request #86 from dkavolis/1.9

KSP 1.9
dkavolis · Feb 22, 2020 · ddd7e92 · ddd7e92
2 parents 2cf406c + 64dca21
commit ddd7e92
Show file tree

Hide file tree

Showing 104 changed files with 670 additions and 990 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
  <PropertyGroup>
-   <KSP_DIR_BUILD>C:\Zaidimai\KSP 1.8.0\</KSP_DIR_BUILD>
+   <KSP_DIR_BUILD>C:\Zaidimai\KSP 1.9.0\</KSP_DIR_BUILD>
    <PostBuildCommand>
       cd "$(SolutionDir)""
       python -m buildtools postbuild -f "$(SolutionDir)config.json" -c "$(Configuration)" -t</PostBuildCommand>

diff --git a/FerramAerospaceResearch/CompatibilityChecker.cs b/FerramAerospaceResearch/CompatibilityChecker.cs
diff --git a/FerramAerospaceResearch/FARAPI.cs b/FerramAerospaceResearch/FARAPI.cs
@@ -1,5 +1,5 @@
 /*
-Ferram Aerospace Research v0.15.11.3 "Mach"
+Ferram Aerospace Research v0.15.11.4 "Mach"
 =========================
 Aerodynamics model for Kerbal Space Program
 

diff --git a/FerramAerospaceResearch/FARAeroComponents/FARAeroPartModule.cs b/FerramAerospaceResearch/FARAeroComponents/FARAeroPartModule.cs
@@ -1,5 +1,5 @@
 /*
-Ferram Aerospace Research v0.15.11.3 "Mach"
+Ferram Aerospace Research v0.15.11.4 "Mach"
 =========================
 Aerodynamics model for Kerbal Space Program
 

diff --git a/FerramAerospaceResearch/FARAeroComponents/FARAeroSection.cs b/FerramAerospaceResearch/FARAeroComponents/FARAeroSection.cs
@@ -1,5 +1,5 @@
 /*
-Ferram Aerospace Research v0.15.11.3 "Mach"
+Ferram Aerospace Research v0.15.11.4 "Mach"
 =========================
 Aerodynamics model for Kerbal Space Program
 
@@ -437,13 +437,12 @@ IForceContext forceContext
 
                 if (velLocal.sqrMagnitude > 0.001f)
                     torqueVector -= dampingMoment * nonAxialAngLocalVel +
-                                    rollDampingMoment *
                                     axialAngLocalVel *
-                                    axialAngLocalVel.magnitude /
+                                    (rollDampingMoment * axialAngLocalVel.magnitude) /
                                     velLocal.sqrMagnitude;
                 else
                     torqueVector -= dampingMoment * nonAxialAngLocalVel +
-                                    rollDampingMoment * axialAngLocalVel * axialAngLocalVel.magnitude / 0.001f;
+                                    axialAngLocalVel * (rollDampingMoment * axialAngLocalVel.magnitude) / 0.001f;
 
                 forceVector *= data.dragFactor;
                 torqueVector *= data.dragFactor;

diff --git a/FerramAerospaceResearch/FARAeroComponents/FARVesselAero.cs b/FerramAerospaceResearch/FARAeroComponents/FARVesselAero.cs
@@ -1,5 +1,5 @@
 /*
-Ferram Aerospace Research v0.15.11.3 "Mach"
+Ferram Aerospace Research v0.15.11.4 "Mach"
 =========================
 Aerodynamics model for Kerbal Space Program
 
@@ -97,12 +97,6 @@ protected override void OnStart()
             FARLogger.Info("FARVesselAero on " + vessel.name + " reporting startup");
             base.OnStart();
 
-            if (!CompatibilityChecker.IsAllCompatible())
-            {
-                enabled = false;
-                return;
-            }
-
             if (!HighLogic.LoadedSceneIsFlight)
             {
                 enabled = false;

diff --git a/FerramAerospaceResearch/FARAeroComponents/FlightForceContext.cs b/FerramAerospaceResearch/FARAeroComponents/FlightForceContext.cs
@@ -1,5 +1,5 @@
 /*
-Ferram Aerospace Research v0.15.11.3 "Mach"
+Ferram Aerospace Research v0.15.11.4 "Mach"
 =========================
 Copyright 2019, Benjamin Chung, aka BenChung
 

diff --git a/FerramAerospaceResearch/FARAeroComponents/ModularFlightIntegratorRegisterer.cs b/FerramAerospaceResearch/FARAeroComponents/ModularFlightIntegratorRegisterer.cs
@@ -1,5 +1,5 @@
 /*
-Ferram Aerospace Research v0.15.11.3 "Mach"
+Ferram Aerospace Research v0.15.11.4 "Mach"
 =========================
 Aerodynamics model for Kerbal Space Program
 

diff --git a/FerramAerospaceResearch/FARAeroComponents/SimulatedForceContext.cs b/FerramAerospaceResearch/FARAeroComponents/SimulatedForceContext.cs
@@ -1,5 +1,5 @@
 /*
-Ferram Aerospace Research v0.15.11.3 "Mach"
+Ferram Aerospace Research v0.15.11.4 "Mach"
 =========================
 Copyright 2019, Benjamin Chung, aka BenChung
 

diff --git a/FerramAerospaceResearch/FARAeroComponents/VehicleAerodynamics.cs b/FerramAerospaceResearch/FARAeroComponents/VehicleAerodynamics.cs
@@ -1,5 +1,5 @@
 /*
-Ferram Aerospace Research v0.15.11.3 "Mach"
+Ferram Aerospace Research v0.15.11.4 "Mach"
 =========================
 Aerodynamics model for Kerbal Space Program
 

diff --git a/FerramAerospaceResearch/FARAeroComponents/VesselIntakeRamDrag.cs b/FerramAerospaceResearch/FARAeroComponents/VesselIntakeRamDrag.cs
@@ -1,5 +1,5 @@
 /*
-Ferram Aerospace Research v0.15.11.3 "Mach"
+Ferram Aerospace Research v0.15.11.4 "Mach"
 =========================
 Aerodynamics model for Kerbal Space Program
 

diff --git a/FerramAerospaceResearch/FARAeroUtil.cs b/FerramAerospaceResearch/FARAeroUtil.cs
@@ -1,5 +1,5 @@
 /*
-Ferram Aerospace Research v0.15.11.3 "Mach"
+Ferram Aerospace Research v0.15.11.4 "Mach"
 =========================
 Aerodynamics model for Kerbal Space Program
 
@@ -212,17 +212,17 @@ public static FloatCurve PrandtlMeyerAngle
         // ReSharper disable once UnusedMember.Global
         public static List<FARWingAerodynamicModel> CurEditorWings
         {
-            get { return curEditorWingCache ?? (curEditorWingCache = ListEditorWings()); }
+            get { return curEditorWingCache ??= ListEditorWings(); }
         }
 
         public static List<Part> CurEditorParts
         {
-            get { return CurEditorPartsCache ?? (CurEditorPartsCache = ListEditorParts(false)); }
+            get { return CurEditorPartsCache ??= ListEditorParts(false); }
         }
 
         public static List<Part> AllEditorParts
         {
-            get { return AllEditorPartsCache ?? (AllEditorPartsCache = ListEditorParts(true)); }
+            get { return AllEditorPartsCache ??= ListEditorParts(true); }
         }
 
         public static int RaycastMask

diff --git a/FerramAerospaceResearch/FARDebugAndSettings.cs b/FerramAerospaceResearch/FARDebugAndSettings.cs
@@ -1,5 +1,5 @@
 /*
-Ferram Aerospace Research v0.15.11.3 "Mach"
+Ferram Aerospace Research v0.15.11.4 "Mach"
 =========================
 Aerodynamics model for Kerbal Space Program
 
@@ -101,12 +101,6 @@ private void Awake()
 
         private void Start()
         {
-            if (!CompatibilityChecker.IsAllCompatible())
-            {
-                enabled = false;
-                return;
-            }
-
             FARAeroSection.GenerateCrossFlowDragCurve();
             FARAeroStress.LoadStressTemplates();
             FARAeroUtil.LoadAeroDataFromConfig();
@@ -621,9 +615,6 @@ public static void SaveConfigs(ConfigNode node)
 
         private void OnDestroy()
         {
-            if (!CompatibilityChecker.IsAllCompatible())
-                return;
-
             GameEvents.onGameSceneSwitchRequested.Remove(OnSceneChange);
 
             FARDebugButtonBlizzy?.Destroy();