Merge pull request #2 from BahamutoD/master

Pull in changes
BahamutoD · Feb 11, 2016 · 800cccd · 800cccd
2 parents e79274d + 377e278
commit 800cccd
Show file tree

Hide file tree

Showing 27 changed files with 2,149 additions and 319 deletions.
diff --git a/BahaTurret/BDATargetManager.cs b/BahaTurret/BDATargetManager.cs
@@ -444,7 +444,6 @@ void SaveGPSTargets(ConfigNode saveNode)
 		void LoadGPSTargets(ConfigNode saveNode)
 		{
 			ConfigNode fileNode = ConfigNode.Load("GameData/BDArmory/gpsTargets.cfg");
-
 			string saveTitle = HighLogic.CurrentGame.Title;
 
 			if(fileNode != null && fileNode.HasNode("BDARMORY"))
@@ -649,6 +648,10 @@ public static void ReportVessel(Vessel v, MissileFire reporter)
 					return;
 				}
 			}
+			else
+			{
+				info.detectedTime = Time.time;
+			}
 		}
 
 		public static void ClearDatabase()

diff --git a/BahaTurret/BDArmorySettings.cs b/BahaTurret/BDArmorySettings.cs
@@ -996,7 +996,9 @@ void ToolbarGUI(int windowID)
 					GUI.Label(new Rect(leftIndent, (guardLines*entryHeight), 85, entryHeight), "Guns Range", leftLabel);
 					float gRange = ActiveWeaponManager.gunRange;
 					gRange = GUI.HorizontalSlider(new Rect(leftIndent+90, (guardLines*entryHeight), contentWidth-90-38, entryHeight), gRange, 0, 10000);
+					gRange /= 100f;
 					gRange = Mathf.Round(gRange);
+					gRange *= 100f;
 					ActiveWeaponManager.gunRange = gRange;
 					GUI.Label(new Rect(leftIndent+(contentWidth-35), (guardLines*entryHeight), 35, entryHeight), ActiveWeaponManager.gunRange.ToString(), leftLabel);
 					guardLines++;

diff --git a/BahaTurret/BDExplosivePart.cs b/BahaTurret/BDExplosivePart.cs
@@ -11,6 +11,9 @@ public class BDExplosivePart : PartModule
 		[KSPField(isPersistant = false)]
 		public float blastPower = 25;
 
+		[KSPField]
+		public float blastHeat = -1;
+
 		[KSPAction("Detonate")]
 		public void DetonateAG(KSPActionParam param)
 		{
@@ -52,7 +55,7 @@ public void Detonate()
 				hasDetonated = true;
 				if(part!=null) part.temperature = part.maxTemp + 100;
 				Vector3 position = transform.position+part.rb.velocity*Time.fixedDeltaTime;
-				ExplosionFX.CreateExplosion(position, blastRadius, blastPower, vessel, FlightGlobals.getUpAxis(), "BDArmory/Models/explosion/explosionLarge", "BDArmory/Sounds/explode1");
+				ExplosionFX.CreateExplosion(position, blastRadius, blastPower, blastHeat, vessel, FlightGlobals.getUpAxis(), "BDArmory/Models/explosion/explosionLarge", "BDArmory/Sounds/explode1");
 			}
 		}
 	}