Develop merge

.gitignore

@@ -8,4 +8,5 @@ WarpPlugin.dll
 *.mu
 *.mbm
 *.ogg
-*.psd
+*.psd
+bin

FNPlugin/FNGenerator.cs

@@ -225,7 +225,7 @@ public float getMaxPowerOutput() {
 		}
 
 		public void updateGeneratorPower() {
-			hotBathTemp = myAttachedReactor.getCoreTemp();
+			hotBathTemp = myAttachedReactor.getThermalTemp();
 			maxThermalPower = myAttachedReactor.getThermalPower();
 			coldBathTemp = FNRadiator.getAverageRadiatorTemperatureForVessel (vessel);
 		}

FNPlugin/FNNozzleController.cs

@@ -308,7 +308,7 @@ public void updateIspEngineParams() {
 			// recaculate ISP based on power and core temp available
 			FloatCurve newISP = new FloatCurve();
 			FloatCurve vCurve = new FloatCurve ();
-			maxISP = (float)(Math.Sqrt ((double)myAttachedReactor.getCoreTemp ()) * 17.0 * ispMultiplier);
+			maxISP = (float)(Math.Sqrt ((double)myAttachedReactor.getThermalTemp ()) * 17.0 * ispMultiplier);
 			if (!currentpropellant_is_jet) {
 				minISP = maxISP * 0.4f;
 				newISP.Add (0, maxISP, 0, 0);
@@ -369,12 +369,10 @@ public bool hasStarted() {
 
 		public override void OnFixedUpdate() {
 			//tell static helper methods we are currently updating things
-
-
+			if (!myAttachedReactor.isActive()) {
+				myAttachedReactor.enableIfPossible();
+			}
 			if (myAttachedEngine.isOperational && myAttachedEngine.currentThrottle > 0 && myAttachedReactor != null) {
-				if (!myAttachedReactor.isActive()) {
-					myAttachedReactor.enableIfPossible();
-				}
 				updateIspEngineParams ();
 				float curve_eval_point = (float)Math.Min (FlightGlobals.getStaticPressure (vessel.transform.position), 1.0);
 				float currentIsp = myAttachedEngine.atmosphereCurve.Evaluate (curve_eval_point);
@@ -453,7 +451,7 @@ public override void OnFixedUpdate() {
 
 				if (myAttachedReactor == null && myAttachedEngine.isOperational && myAttachedEngine.currentThrottle > 0) {
 					myAttachedEngine.Events ["Shutdown"].Invoke ();
-					ScreenMessages.PostScreenMessage ("Engine Shutdown: No reactor attached!", 5.0f, ScreenMessageStyle.UPPER_CENTER);
+					ScreenMessages.PostScreenMessage ("Engine Shutdown: No thermal power source attached!", 5.0f, ScreenMessageStyle.UPPER_CENTER);
 				}
 			}
 

FNPlugin/FNReactor.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -22,11 +22,11 @@ class FNReactor : FNResourceSuppliableModule, FNThermalSource    {
 
         // Persistent False
         [KSPField(isPersistant = false)]
-        public float ReactorTemp;
+        public float ThermalTemp;
         [KSPField(isPersistant = false)]
         public float ThermalPower;
         [KSPField(isPersistant = false)]
-        public float upgradedReactorTemp;
+        public float upgradedThermalTemp;
         [KSPField(isPersistant = false)]
         public float upgradedThermalPower;
         [KSPField(isPersistant = false)]
@@ -134,7 +134,7 @@ public void ToggleReactorAction(KSPActionParam param) {
 		public override void OnLoad(ConfigNode node) {
             if (isupgraded) {
 				ThermalPower = upgradedThermalPower;
-				ReactorTemp = upgradedReactorTemp;
+				ThermalTemp = upgradedThermalTemp;
 				reactorType = upgradedName;
 				resourceRate = upgradedResourceRate;
 			}else {
@@ -146,7 +146,7 @@ public override void OnLoad(ConfigNode node) {
 		public void upgradePart() {
 			isupgraded = true;
 			ThermalPower = upgradedThermalPower;
-			ReactorTemp = upgradedReactorTemp;
+			ThermalTemp = upgradedThermalTemp;
 			reactorType = upgradedName;
             resourceRate = upgradedResourceRate;
 		}
@@ -296,8 +296,8 @@ public override void OnUpdate() {
             }
         }
 
-        public float getCoreTemp() {
-            return ReactorTemp;
+        public float getThermalTemp() {
+            return ThermalTemp;
         }
 
         public float getThermalPower() {
@@ -425,8 +425,8 @@ public static double getTemperatureofHottestReactor(Vessel vess) {
 			double temp = 0;
 			foreach (FNReactor reactor in reactors) {
 				if (reactor != null) {
-					if (reactor.getCoreTemp () > temp) {
-						temp = reactor.getCoreTemp ();
+					if (reactor.getThermalTemp () > temp) {
+						temp = reactor.getThermalTemp ();
 					}
 				}
 			}

FNPlugin/FNThermalHeatExchanger.cs

@@ -82,8 +82,8 @@ public override void OnFixedUpdate() {
 			setupThermalPower ();
 		}
 
-		public float getCoreTemp() {
-            return 1500;
+		public float getThermalTemp() {
+			return 1500f;
 		}
 
 		public float getThermalPower() {
@@ -102,6 +102,9 @@ public bool isActive() {
             return IsEnabled;
         }
 
+		public bool getIsThermalHeatExchanger() {
+			return true;
+		}
         public void enableIfPossible() {
             IsEnabled = true;
         }

FNPlugin/FNThermalSource.cs

@@ -3,12 +3,14 @@
 namespace FNPlugin{
 	public interface FNThermalSource{
 
-		float getCoreTemp();
+		float getThermalTemp();
 
 		float getThermalPower();
 
 		bool getIsNuclear();
 
+		bool getIsThermalHeatExchanger();
+
 		float getRadius();
 
 		bool isActive();