Merge pull request #76 from DMagic1/dev

Version 1.3.9

GameData/DMagicOrbitalScience/Change Log.txt

@@ -1,4 +1,11 @@
-v1.3.8
+v1.3.9
+- Updated for KSP 1.3
+
+- Fix several bugs with SIGINT and Soil Moisture antenna usage
+- Add option to disable transmsission from these parts
+- Change these antennas to Relay type and remove the part upgrade functions
+
+v1.3.8
 - Fix for magnetic field and reconnaissance contracts when using a vessel already in orbit
 - Fix for Seismic impact hammer experiments when decoupling or undocking from another vessel
 - Fix for X-Ray and Seismic impact hammer experiments when using Kopernicus and planet packs that replace Kerbin

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://spacedock.info/mod/128/DMagic%20Orbital%20Science/download/1.3.7",
+     "DOWNLOAD":"https://spacedock.info/mod/128/DMagic%20Orbital%20Science/download/1.3.9",
      "GITHUB":{
          "USERNAME":"DMagic1",
          "REPOSITORY":"Orbital-Science",
@@ -11,21 +11,21 @@
          "MAJOR":1,
          "MINOR":3,
          "PATCH":0,
-         "BUILD":8
+         "BUILD":9
      },
      "KSP_VERSION":{
          "MAJOR":1,
-         "MINOR":2,
-         "PATCH":2
+         "MINOR":3,
+         "PATCH":0
      },
      "KSP_VERSION_MIN":{
          "MAJOR":1,
-         "MINOR":2,
-         "PATCH":1
+         "MINOR":3,
+         "PATCH":0
      },
      "KSP_VERSION_MAX":{
          "MAJOR":1,
-         "MINOR":2,
-         "PATCH":2
+         "MINOR":3,
+         "PATCH":8
      }
  } 

GameData/DMagicOrbitalScience/OversizeScience/SIGINT.cfg

@@ -108,25 +108,13 @@ DRAG_CUBE
 		MODULE
 	{
 		name = ModuleDataTransmitter
-		antennaType = DIRECT
+		antennaType = RELAY
 		packetInterval = 0.08
 		packetSize = 4
 		packetResourceCost = 55.0
 		requiredResource = ElectricCharge
 		DeployFxModules = 0
 		antennaPower = 10000000000000
-		antennaCombinable = False
-
-		UPGRADES
-		{
-			UPGRADE
-			{
-				name__ = dm_antenna_upgrade
-				description__ = Antenna upgraded with signal relay
-				antennaType = RELAY
-				antennaPower = 20000000000000
-				antennaCombinable = True
-			}
-		}
+		antennaCombinable = True
 	}
 }

GameData/DMagicOrbitalScience/OversizeScience/SIGINT_End.cfg

@@ -107,26 +107,14 @@ DRAG_CUBE
 	MODULE
 	{
 		name = ModuleDataTransmitter
-		antennaType = DIRECT
+		antennaType = RELAY
 		packetInterval = 0.08
 		packetSize = 4
 		packetResourceCost = 55.0
 		requiredResource = ElectricCharge
 		DeployFxModules = 0
 		antennaPower = 10000000000000
-		antennaCombinable = False
-
-		UPGRADES
-		{
-			UPGRADE
-			{
-				name__ = dm_antenna_upgrade
-				description__ = Antenna upgraded with signal relay
-				antennaType = RELAY
-				antennaPower = 20000000000000
-				antennaCombinable = True
-			}
-		}
+		antennaCombinable = True
 	}
 	
 	MODULE

GameData/DMagicOrbitalScience/OversizeScience/SIGINT_Small.cfg

@@ -110,25 +110,13 @@ DRAG_CUBE
 		MODULE
 	{
 		name = ModuleDataTransmitter
-		antennaType = DIRECT
+		antennaType = RELAY
 		packetInterval = 0.1
 		packetSize = 2
 		packetResourceCost = 25.0
 		requiredResource = ElectricCharge
 		DeployFxModules = 0
 		antennaPower = 1000000000000
-		antennaCombinable = False
-
-		UPGRADES
-		{
-			UPGRADE
-			{
-				name__ = dm_antenna_upgrade
-				description__ = Antenna upgraded with signal relay
-				antennaType = RELAY
-				antennaPower = 2000000000000
-				antennaCombinable = True
-			}
-		}		
+		antennaCombinable = True
 	}
 }

GameData/DMagicOrbitalScience/ProbeScience/SoilMoisture/SoilMoisture.cfg

@@ -87,25 +87,13 @@ minimum_drag = 0.2
 	MODULE
 	{
 		name = ModuleDataTransmitter
-		antennaType = DIRECT
+		antennaType = RELAY
 		packetInterval = 0.2
 		packetSize = 4
 		packetResourceCost = 30.0
 		requiredResource = ElectricCharge
 		DeployFxModules = 0
 		antennaPower = 100000000000
-		antennaCombinable = False
-
-		UPGRADES
-		{
-			UPGRADE
-			{
-				name__ = dm_antenna_upgrade
-				description__ = Antenna upgraded with signal relay
-				antennaType = RELAY
-				antennaPower = 200000000000
-				antennaCombinable = True
-			}
-		}
+		antennaCombinable = True
 	}
 }

GameData/DMagicOrbitalScience/UniversalStorage/USSoilMoisture/USSoilMoisture.cfg

@@ -101,26 +101,14 @@ dragModelType = default
 	MODULE
 	{
 		name = ModuleDataTransmitter
-		antennaType = DIRECT
+		antennaType = RELAY
 		packetInterval = 0.1
 		packetSize = 4
 		packetResourceCost = 20.0
 		requiredResource = ElectricCharge
 		DeployFxModules = 0
 		antennaPower = 50000000000
-		antennaCombinable = False
-
-		UPGRADES
-		{
-			UPGRADE
-			{
-				name__ = dm_antenna_upgrade
-				description__ = Antenna upgraded with signal relay
-				antennaType = RELAY
-				antennaPower = 100000000000
-				antennaCombinable = True
-			}
-		}
+		antennaCombinable = True
 	}
 }
 

Source/Contracts/DMAnomalyContract.cs

@@ -113,7 +113,7 @@ protected override bool Generate()
 			{
 				CelestialBody b = customReachedBodies[i];
 
-				DMAnomalyStorage stor = DMAnomalyList.getAnomalyStorage(b.name);
+				DMAnomalyStorage stor = DMAnomalyList.getAnomalyStorage(b.bodyName);
 
 				if (stor == null)
 					continue;
@@ -265,7 +265,7 @@ protected override string GetTitle()
 			if (targetAnomaly == null)
 				return "Whoops. Something bad happened here...";
 
-			return string.Format("Study the source of the anomalous readings coming from {0}'s surface", targetAnomaly.Body.theName);
+			return string.Format("Study the source of the anomalous readings coming from {0}'s surface", targetAnomaly.Body.displayName.LocalizeBodyName());
 		}
 
 		protected override string GetNotes()
@@ -279,23 +279,23 @@ protected override string GetDescription()
 				return "Whoops. Something bad happened here...";
 
 			string story = DMContractDefs.DMAnomaly.backStory[rand.Next(0, DMContractDefs.DMAnomaly.backStory.Count)];
-			return string.Format(story, this.agent.Name, targetAnomaly.Body.theName);
+			return string.Format(story, this.agent.Name, targetAnomaly.Body.displayName.LocalizeBodyName());
 		}
 
 		protected override string GetSynopsys()
 		{
 			if (targetAnomaly == null)
 				return "Whoops. Something bad happened here...";
 
-			return string.Format("We would like you to travel to a specific location on {0}. Once there attempt to locate and study the source of the anomalous signal.", targetAnomaly.Body.theName);
+			return string.Format("We would like you to travel to a specific location on {0}. Once there attempt to locate and study the source of the anomalous signal.", targetAnomaly.Body.displayName.LocalizeBodyName());
 		}
 
 		protected override string MessageCompleted()
 		{
 			if (targetAnomaly == null)
 				return "Whoops. Something bad happened here...";
 
-			return string.Format("You successfully returned data from the {0} on {1}, well done.", hash, targetAnomaly.Body.theName);
+			return string.Format("You successfully returned data from the {0} on {1}, well done.", hash, targetAnomaly.Body.displayName.LocalizeBodyName());
 		}
 
 		protected override void OnLoad(ConfigNode node)
@@ -357,7 +357,7 @@ protected override void OnSave(ConfigNode node)
 
 		public override bool MeetRequirements()
 		{
-			return ProgressTracking.Instance.NodeComplete(new string[] { Planetarium.fetch.Home.name, "Orbit" });
+			return ProgressTracking.Instance.NodeComplete(new string[] { Planetarium.fetch.Home.bodyName, "Orbit" });
 		}
 
 		/// <summary>

Source/Contracts/DMAsteroidSurveyContract.cs

@@ -227,7 +227,7 @@ public override bool MeetRequirements()
 			if (Planetarium.fetch.Home.orbitingBodies.Count < 2)
 				return GameVariables.Instance.UnlockedSpaceObjectDiscovery(ScenarioUpgradeableFacilities.GetFacilityLevel(SpaceCenterFacility.TrackingStation));
 			else
-				return ProgressTracking.Instance.NodeComplete(new string[] { Planetarium.fetch.Home.orbitingBodies[1].name, "Orbit" }) && GameVariables.Instance.UnlockedSpaceObjectDiscovery(ScenarioUpgradeableFacilities.GetFacilityLevel(SpaceCenterFacility.TrackingStation));
+				return ProgressTracking.Instance.NodeComplete(new string[] { Planetarium.fetch.Home.orbitingBodies[1].bodyName, "Orbit" }) && GameVariables.Instance.UnlockedSpaceObjectDiscovery(ScenarioUpgradeableFacilities.GetFacilityLevel(SpaceCenterFacility.TrackingStation));
 		}
 
 		public string AsteroidSize

Source/Contracts/DMMagneticSurveyContract.cs

@@ -264,15 +264,15 @@ public override bool CanBeDeclined()
 
 		protected override string GetHashString()
 		{
-			return string.Format("{0}{1}", body.name, (int)this.prestige);
+			return string.Format("{0}{1}", body.bodyName, (int)this.prestige);
 		}
 
 		protected override string GetTitle()
 		{
 			if (body == null)
 				return "Whoops. Something bad happened here...";
 
-			return string.Format("Conduct a survey of the magnetic field environment around {0}", body.theName);
+			return string.Format("Conduct a survey of the magnetic field environment around {0}", body.displayName.LocalizeBodyName());
 		}
 
 		protected override string GetDescription()
@@ -281,23 +281,23 @@ protected override string GetDescription()
 				return "Whoops. Something bad happened here...";
 
 			string story = DMContractDefs.DMMagnetic.backStory[rand.Next(0, DMContractDefs.DMMagnetic.backStory.Count)];
-			return string.Format(story, this.agent.Name, body.theName);
+			return string.Format(story, this.agent.Name, body.displayName.LocalizeBodyName());
 		}
 
 		protected override string GetSynopsys()
 		{
 			if (body == null)
 				return "Whoops. Something bad happened here...";
 
-			return string.Format("Study the magnetic field environment around {0} by inserting a long-term research vessel into orbit.", body.theName);
+			return string.Format("Study the magnetic field environment around {0} by inserting a long-term research vessel into orbit.", body.displayName.LocalizeBodyName());
 		}
 
 		protected override string MessageCompleted()
 		{
 			if (body == null)
 				return "Whoops. Something bad happened here...";
 
-			return string.Format("You completed a survey of {0}, well done.", body.theName);
+			return string.Format("You completed a survey of {0}, well done.", body.displayName.LocalizeBodyName());
 		}
 
 		protected override void OnLoad(ConfigNode node)
@@ -338,7 +338,7 @@ protected override void OnSave(ConfigNode node)
 
 		public override bool MeetRequirements()
 		{
-			return ProgressTracking.Instance.NodeComplete(new string[] { Planetarium.fetch.Home.name, "Escape" });
+			return ProgressTracking.Instance.NodeComplete(new string[] { Planetarium.fetch.Home.bodyName, "Escape" });
 		}
 
 		/// <summary>