diff --git a/GameData/AJE/AJE.version b/GameData/AJE/AJE.version index 748a928..9285661 100644 --- a/GameData/AJE/AJE.version +++ b/GameData/AJE/AJE.version @@ -9,12 +9,17 @@ "VERSION" : { "MAJOR" : 2, "MINOR" : 7, - "PATCH" : 2, + "PATCH" : 1, "BUILD" : 0 }, - "KSP_VERSION" : { + "KSP_VERSION_MIN" : { "MAJOR" : 1, "MINOR" : 1, - "PATCH" : 3 + "PATCH" : 2 + }, + "KSP_VERSION_MAX" : { + "MAJOR" : 1, + "MINOR" : 1, + "PATCH" : 2 } } diff --git a/GameData/AJE/Plugins/AJE.dll b/GameData/AJE/Plugins/AJE.dll index 597242e..0dbafc2 100644 Binary files a/GameData/AJE/Plugins/AJE.dll and b/GameData/AJE/Plugins/AJE.dll differ diff --git a/GameData/SolverEngines/Plugins/SolverEngines.dll b/GameData/SolverEngines/Plugins/SolverEngines.dll index e762b66..980e587 100644 Binary files a/GameData/SolverEngines/Plugins/SolverEngines.dll and b/GameData/SolverEngines/Plugins/SolverEngines.dll differ diff --git a/GameData/SolverEngines/Readme_SolverEngines.txt b/GameData/SolverEngines/Readme_SolverEngines.txt index 98ebd9f..1591b7f 100644 --- a/GameData/SolverEngines/Readme_SolverEngines.txt +++ b/GameData/SolverEngines/Readme_SolverEngines.txt @@ -29,16 +29,11 @@ See AJE or RealFuels for examples of how to implement SolverEngines in practice. Changelog: -V2.3 -* Revert AssemblyVersion to 2.1.0.0 since latest releases of AJE and RF depend on it - -v2.2 -* Recompile against KSP 1.1.3 - v2.1 * Update for KSP 1.1.2 v2.0 + * Updated for KSP 1.1 * Support variable thrust per transform as in ModuleEngines diff --git a/GameData/SolverEngines/SolverEngines.version b/GameData/SolverEngines/SolverEngines.version index 4ecac71..e7bde58 100644 --- a/GameData/SolverEngines/SolverEngines.version +++ b/GameData/SolverEngines/SolverEngines.version @@ -8,13 +8,18 @@ }, "VERSION" : { "MAJOR" : 2, - "MINOR" : 3, + "MINOR" : 1, "PATCH" : 0, "BUILD" : 0 }, - "KSP_VERSION" : { + "KSP_VERSION_MIN" : { + "MAJOR" : 1, + "MINOR" : 1, + "PATCH" : 2 + }, + "KSP_VERSION_MAX" : { "MAJOR" : 1, "MINOR" : 1, - "PATCH" : 3 + "PATCH" : 2 } } diff --git a/Source/AJE.csproj b/Source/AJE.csproj index f1d4b4e..412d534 100644 --- a/Source/AJE.csproj +++ b/Source/AJE.csproj @@ -53,18 +53,22 @@ + ..\..\..\..\..\..\Games\KSP_win1\KSP_x64_Data\Managed\Assembly-CSharp.dll False + ..\..\..\..\..\..\Games\KSP_win1\KSP_x64_Data\Managed\KSPUtil.dll False + ..\..\SolverEngines\GameData\SolverEngines\Plugins\SolverEngines.dll False False + ..\..\..\..\..\..\Games\KSP_win1\KSP_x64_Data\Managed\UnityEngine.dll False diff --git a/Source/AJEJet.cs b/Source/AJEJet.cs index 0bc4479..93b0a7b 100644 --- a/Source/AJEJet.cs +++ b/Source/AJEJet.cs @@ -7,12 +7,11 @@ using UnityEngine; using System.Reflection; using SolverEngines; -using SolverEngines.EngineFitting; namespace AJE { - public class ModuleEnginesAJEJet : ModuleEnginesSolver, IModuleInfo, IEngineStatus, IFittableEngine + public class ModuleEnginesAJEJet : ModuleEnginesSolver, IModuleInfo, IEngineStatus { [EngineFitResult] [KSPField(isPersistant = false, guiActive = false)] @@ -269,15 +268,13 @@ public float GetStaticWetNozzleArea() #region Engine Fitting - public bool CanFitEngine => true; - - public void PushFitParamsToSolver() + public override void PushFitParamsToSolver() { (engineSolver as SolverJet).SetFitParams(Area, FHV, TAB, minThrottle, turbineAreaRatio); PushAreaToInlet(); } - public void DoEngineFit() + public override void DoEngineFit() { SolverJet jetEngine = engineSolver as SolverJet; jetEngine.FitEngine(dryThrust * 1000d, drySFC, wetThrust * 1000d, idleNPR, defaultTPR : defaultTPR); @@ -398,6 +395,9 @@ public override string GetInfo() private void SetStaticSimulation() { + CreateEngineIfNecessary(); + + FitEngineIfNecessary(); ambientTherm = new EngineThermodynamics(); ambientTherm.FromStandardConditions(true); diff --git a/Source/Properties/AssemblyInfo.cs b/Source/Properties/AssemblyInfo.cs index b38b975..f8c74e1 100644 --- a/Source/Properties/AssemblyInfo.cs +++ b/Source/Properties/AssemblyInfo.cs @@ -33,7 +33,8 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.7.2.0")] -[assembly: AssemblyFileVersion("2.7.2.0")] +[assembly: AssemblyVersion("2.7.1.0")] +[assembly: AssemblyFileVersion("2.7.1.0")] +// Keep this the same [assembly: KSPAssemblyDependency("SolverEngines", 2, 1)]