0.4.1

v0.4.1
-fixed AnimatedEngines heat & dV measurements (DREC, KER, MechJeb
compatibility)

Author: BahamutoD

BDAnimationModules/AnimatedEngine.cs

@@ -21,27 +21,19 @@ public class AnimatedEngine : PartModule
 		private AnimationState[]  engineStates;
 		private bool engineIsFX = false;
 
-		private float oMaxThrust;
-		private float oMinThrust;
 
 		public override void OnStart(PartModule.StartState state)
 		{
 
-			try{
-				engineStates = SetUpAnimation(EngineAnimationName, this.part);
-			}catch(NullReferenceException e){Debug.Log ("NRE while setting up animation: "+e);}
-
-
-			
+			engineStates = SetUpAnimation(EngineAnimationName, this.part);
+		
 			foreach (var me in this.part.FindModulesImplementing<ModuleEngines>())
 			{
 				engineIsOn = me.EngineIgnited;
 				modEng = me;
 				engineIsFX = false;
 			}
 
-
-		
 			foreach (var me in this.part.FindModulesImplementing<ModuleEnginesFX>())
 			{
 				engineIsOn = me.EngineIgnited;
@@ -62,21 +54,6 @@ public override void OnStart(PartModule.StartState state)
 				}
 			}
 
-			if(modEng!=null)
-			{
-				oMaxThrust = modEng.maxThrust;
-				oMinThrust = modEng.minThrust;
-				modEng.maxThrust = 0;
-				modEng.minThrust = 0;
-			}
-			if(modEngFX!=null)
-			{
-				oMaxThrust = modEngFX.maxThrust;
-				oMinThrust = modEngFX.minThrust;
-				modEngFX.maxThrust = 0;
-				modEngFX.minThrust = 0;
-			}
-			
 		}
 
 
@@ -91,59 +68,46 @@ public override void OnUpdate()
 			{
 				engineIsOn = modEngFX.EngineIgnited;
 			}
-
+			
 
 			foreach(var anim in engineStates)
 			{
-				if(anim.normalizedTime>=1)
+				
+				
+				if(engineIsOn && anim.normalizedTime < WaitForAnimation)
 				{
-					anim.speed = 0;
-					anim.normalizedTime = 1;
+					anim.speed = 1;
+					if(engineIsFX) modEngFX.Shutdown();
+					else modEng.Shutdown();
+					
 				}
-				if(anim.normalizedTime <=0)
+				
+				
+				if(anim.normalizedTime >= WaitForAnimation && anim.speed > 0)
 				{
-					anim.speed = 0;
-					anim.normalizedTime = 0;
+					if(engineIsFX) modEngFX.Activate();
+					else modEng.Activate();	
 				}
-			
-
-				if(engineIsOn)
+				
+				if(anim.normalizedTime>=1)
 				{
-					anim.speed = 1;
+					anim.speed = 0;
+					anim.normalizedTime = 1;
 				}
-				else
+				
+				if(anim.normalizedTime >=1 && !engineIsOn)
 				{
 					anim.speed = -1;
+					
 				}
 
-			
-				if (anim.normalizedTime < WaitForAnimation && anim.normalizedTime > 0)
+				if(anim.normalizedTime <0)
 				{
-					if(!engineIsFX)
-					{
-						modEng.maxThrust = 0;
-						modEng.minThrust = 0;
-					}
-					else
-					{
-						modEngFX.maxThrust = 0;
-						modEng.minThrust = 0;
-					}
-				}
-				if (anim.normalizedTime >= WaitForAnimation)
-				{
-					if(!engineIsFX)
-					{
-						modEng.maxThrust = oMaxThrust;
-						modEng.minThrust = oMinThrust;
-					}
-					else
-					{
-						modEngFX.maxThrust = oMaxThrust;
-						modEngFX.minThrust = oMinThrust;
-					}
+					anim.speed = 0;
+					anim.normalizedTime = 0;
 				}
 
+				
 			}
 
 		}

BDAnimationModules/BDAnimationModules.pidb

@@ -13,9 +13,9 @@ public class GenericLoopAnimation : PartModule
 		[KSPField(isPersistant = false)]
 		public string loopName;
 		[KSPField(isPersistant = true)]
-		public string StartGUIName="null";
+		public string StartGUIName = "null";
 		[KSPField(isPersistant = true)]
-		public string EndGUIName="null";
+		public string EndGUIName = "null";
 
 		private AnimationState[] deployStates;
 		private AnimationState[] loopStates;