Merge pull request #36 from DMagic1/dev

Version 1.0.1
DMagic1 · Apr 6, 2015 · 572336c · 572336c
2 parents 06ca88e + 820fbb5
commit 572336c
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 23 deletions.
diff --git a/GameData/DMagic Orbital Science/DMagic Orbital Science.version b/GameData/DMagic Orbital Science/DMagic Orbital Science.version
@@ -1,7 +1,7 @@
 {
      "NAME":"DMagic Orbital Science",
 	 "URL":"https://raw.githubusercontent.com/DMagic1/Orbital-Science/master/GameData/DMagic%20Orbital%20Science/DMagic%20Orbital%20Science.version",
-     "DOWNLOAD":"https://kerbalstuff.com/mod/5/DMagic%20Orbital%20Science/download/1.0",
+     "DOWNLOAD":"https://kerbalstuff.com/mod/5/DMagic%20Orbital%20Science/download/1.0.1",
      "GITHUB":{
          "USERNAME":"DMagic1",
          "REPOSITORY":"Orbital-Science",
@@ -10,7 +10,7 @@
      "VERSION":{
          "MAJOR":1,
          "MINOR":0,
-         "PATCH":0,
+         "PATCH":1,
          "BUILD":0
      },
      "KSP_VERSION":{

diff --git a/GameData/DMagicOrbitalScience/DMagicOrbitalScience.version b/GameData/DMagicOrbitalScience/DMagicOrbitalScience.version
@@ -1,7 +1,7 @@
 {
      "NAME":"DMagic Orbital Science",
 	 "URL":"https://raw.githubusercontent.com/DMagic1/Orbital-Science/master/GameData/DMagicOrbitalScience/DMagicOrbitalScience.version",
-     "DOWNLOAD":"https://kerbalstuff.com/mod/5/DMagic%20Orbital%20Science/download/1.0",
+     "DOWNLOAD":"https://kerbalstuff.com/mod/5/DMagic%20Orbital%20Science/download/1.0.1",
      "GITHUB":{
          "USERNAME":"DMagic1",
          "REPOSITORY":"Orbital-Science",
@@ -10,7 +10,7 @@
      "VERSION":{
          "MAJOR":1,
          "MINOR":0,
-         "PATCH":0,
+         "PATCH":1,
          "BUILD":0
      },
      "KSP_VERSION":{

diff --git a/Source/Part Modules/DMAnomalyScanner.cs b/Source/Part Modules/DMAnomalyScanner.cs
@@ -70,27 +70,38 @@ public override void OnStart(PartModule.StartState state)
 		protected override void Update()
 		{
 			base.Update();
-			if (IsDeployed)
-			{
-				DMScienceScenario.SciScenario.anomalyList.ScannerUpdating = true;
 
-				if (PartResourceLibrary.Instance.GetDefinition(resourceExperiment) != null)
+			if (HighLogic.LoadedSceneIsFlight)
+			{
+				if (IsDeployed)
 				{
-					float cost = resourceCost * Time.deltaTime;
-					part.RequestResource(resourceExperiment, cost);
+					if (PartResourceLibrary.Instance.GetDefinition(resourceExperiment) != null)
+					{
+						float cost = resourceCost * Time.deltaTime;
+						part.RequestResource(resourceExperiment, cost);
+					}
+					if (fullyDeployed)
+					{
+						inRange();
+						rotating = true;
+						dishRotate();
+					}
 				}
-				if (fullyDeployed)
+
+				if (DMScienceScenario.SciScenario != null)
 				{
-					inRange();
-					rotating = true;
-					dishRotate();
+					if (DMScienceScenario.SciScenario.anomalyList != null)
+					{
+						if (IsDeployed)
+							DMScienceScenario.SciScenario.anomalyList.ScannerUpdating = true;
+						else if (DMScienceScenario.SciScenario.anomalyList.ScannerUpdating)
+							DMScienceScenario.SciScenario.anomalyList.ScannerUpdating = false;
+					}
 				}
-			}
-			else if (DMScienceScenario.SciScenario.anomalyList.ScannerUpdating)
-				DMScienceScenario.SciScenario.anomalyList.ScannerUpdating = false;
 
-			if (!fullyDeployed && rotating)
-				spinDishDown();
+				if (!fullyDeployed && rotating)
+					spinDishDown();
+			}
 		}
 
 		new private void OnDestroy()

diff --git a/Source/Part Modules/DMAsteroidScanner.cs b/Source/Part Modules/DMAsteroidScanner.cs
@@ -678,6 +678,7 @@ private void runExperiment(float distance, ModuleAsteroid m)
 				Debug.LogError("[DM] Something Went Wrong Here; Null Asteroid Science Data Returned; Please Report This On The KSP Forum With Output.log Data");
 			else
 			{
+				GameEvents.OnExperimentDeployed.Fire(data);
 				scienceReports.Add(data);
 				Deployed = true;
 				ReviewData();

diff --git a/Source/Part Modules/DMModuleScienceAnimate.cs b/Source/Part Modules/DMModuleScienceAnimate.cs
@@ -619,6 +619,7 @@ protected void runExperiment(ExperimentSituations sit)
 				Debug.LogError("[DM] Something Went Wrong Here; Null Science Data Returned; Please Report This On The KSP Forum With Output.log Data");
 			else
 			{
+				GameEvents.OnExperimentDeployed.Fire(data);
 				if (experimentLimit <= 1)
 				{
 					dataIndex = 0;

diff --git a/Source/Properties/AssemblyInfo.cs b/Source/Properties/AssemblyInfo.cs
@@ -19,7 +19,7 @@
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("5428988e-53a6-4d8e-8af4-014572513e22")]
 
-[assembly: AssemblyVersion("1.0.0")]
-[assembly: AssemblyFileVersion("1.0.0")]
-[assembly: AssemblyInformationalVersion("v1.0")]
-[assembly: KSPAssembly("DMagic", 1, 0)]
+[assembly: AssemblyVersion("1.0.1.0")]
+[assembly: AssemblyFileVersion("1.0.1.0")]
+[assembly: AssemblyInformationalVersion("v1.0.1")]
+[assembly: KSPAssembly("DMagic", 1, 01)]