Merge pull request #69 from DMagic1/dev

Version 1.3.7

GameData/DMagicOrbitalScience/Change Log.txt

@@ -1,4 +1,9 @@
-v1.3.6
+v1.3.7
+- Fix a bug with resetting experiments with an EVA Kerbal
+- Add Module Data Transmitter to Soil Moisture instrument
+- Add antenna upgrade package to turn all Orbital Science antenna parts into relays and boost signal strength
+
+v1.3.6
 - Fix bug preventing SIGINT from working as a comms antenna
 
 v1.3.5

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

GameData/DMagicOrbitalScience/OversizeScience/SIGINT.cfg

@@ -34,7 +34,7 @@ category = none
 subcategory = 0
 title = Oversize Signals Intelligence Satellite
 manufacturer = DMagic
-description = A grossly oversized radio signals intelligence dish that can be used for listening in to every imaginable from of communication, discovering radio anomalies on a planet's surface, or just impressing your neighbor. Warning: Dish is FRAGILE; it is NOT for use in the atmosphere; CANNOT be retracted! Can be used at up to five times the normal low orbit altitude.
+description = A grossly oversized radio signals intelligence dish that can be used for listening in to every imaginable from of communication, discovering radio anomalies on a planet's surface, or just impressing your neighbor. Warning: Dish is FRAGILE; it is NOT for use in the atmosphere; CANNOT be retracted! Can be used at up to five times the normal low orbit altitude. This instrument can also be used as a powerful communications antenna.
 attachRules = 1,0,1,1,0
 
 // --- standard part parameters ---
@@ -114,7 +114,19 @@ DRAG_CUBE
 		packetResourceCost = 55.0
 		requiredResource = ElectricCharge
 		DeployFxModules = 0
-		antennaPower = 1000000000000
+		antennaPower = 10000000000000
 		antennaCombinable = False
+
+		UPGRADES
+		{
+			UPGRADE
+			{
+				name__ = dm_antenna_upgrade
+				description__ = Antenna upgraded with signal relay
+				antennaType = RELAY
+				antennaPower = 20000000000000
+				antennaCombinable = True
+			}
+		}
 	}
 }

GameData/DMagicOrbitalScience/OversizeScience/SIGINT_End.cfg

@@ -27,7 +27,7 @@ category = Science
 subcategory = 0
 title = Oversize Signals Intelligence Satellite
 manufacturer = DMagic
-description = A grossly oversized radio signals intelligence dish that can be used for listening in to every imaginable from of communication, discovering radio anomalies on a planet's surface, or just impressing your neighbor. This instrument also servers as a nose cone, and uses deployable fairing shrouds. Warning: Dish is FRAGILE; it is NOT for use in the atmosphere; CANNOT be retracted! Can be used at up to five times the normal low orbit altitude.
+description = A grossly oversized radio signals intelligence dish that can be used for listening in to every imaginable from of communication, discovering radio anomalies on a planet's surface, or just impressing your neighbor. This instrument also servers as a nose cone, and uses deployable fairing shrouds. Warning: Dish is FRAGILE; it is NOT for use in the atmosphere; CANNOT be retracted! Can be used at up to five times the normal low orbit altitude. This instrument can also be used as a powerful communications antenna.
 attachRules = 1,0,1,1,0
 
 // --- standard part parameters ---
@@ -104,7 +104,7 @@ DRAG_CUBE
 		asteroidReports = False
 	}
 	
-		MODULE
+	MODULE
 	{
 		name = ModuleDataTransmitter
 		antennaType = DIRECT
@@ -113,8 +113,20 @@ DRAG_CUBE
 		packetResourceCost = 55.0
 		requiredResource = ElectricCharge
 		DeployFxModules = 0
-		antennaPower = 1000000000000
+		antennaPower = 10000000000000
 		antennaCombinable = False
+
+		UPGRADES
+		{
+			UPGRADE
+			{
+				name__ = dm_antenna_upgrade
+				description__ = Antenna upgraded with signal relay
+				antennaType = RELAY
+				antennaPower = 20000000000000
+				antennaCombinable = True
+			}
+		}
 	}
 	
 	MODULE

GameData/DMagicOrbitalScience/OversizeScience/SIGINT_Small.cfg

@@ -34,7 +34,7 @@ category = Science
 subcategory = 0
 title = Undersize Signals Intelligence Satellite
 manufacturer = DMagic
-description = A mildly oversized radio signals intelligence dish that can be used for listening in to every imaginable from of communication, discovering radio anomalies on a planet's surface, or just impressing your neighbor. Warning: Dish is FRAGILE; it is NOT for use in the atmosphere; CANNOT be retracted! Can be used at up to five times the normal low orbit altitude.
+description = A mildly oversized radio signals intelligence dish that can be used for listening in to every imaginable from of communication, discovering radio anomalies on a planet's surface, or just impressing your neighbor. Warning: Dish is FRAGILE; it is NOT for use in the atmosphere; CANNOT be retracted! Can be used at up to five times the normal low orbit altitude. This instrument can also be used as a powerful communications antenna.
 attachRules = 1,0,1,1,0
 
 // --- standard part parameters ---
@@ -113,10 +113,22 @@ DRAG_CUBE
 		antennaType = DIRECT
 		packetInterval = 0.1
 		packetSize = 2
-		packetResourceCost = 20.0
+		packetResourceCost = 25.0
 		requiredResource = ElectricCharge
 		DeployFxModules = 0
-		antennaPower = 10000000000
+		antennaPower = 1000000000000
 		antennaCombinable = False
+
+		UPGRADES
+		{
+			UPGRADE
+			{
+				name__ = dm_antenna_upgrade
+				description__ = Antenna upgraded with signal relay
+				antennaType = RELAY
+				antennaPower = 2000000000000
+				antennaCombinable = True
+			}
+		}		
 	}
 }

GameData/DMagicOrbitalScience/ProbeScience/SoilMoisture/SoilMoisture.cfg

@@ -22,7 +22,7 @@ category = Science
 subcategory = 0
 title = Soil Moisture Sensor
 manufacturer = DMagic
-description = This orbital sensor deploys a large L-band microwave detector comprised of 82 individual antenna elements. It can be used to study the water content of the upper soil layers and the salinity levels of large water features. Can only be used in low orbit.
+description = This orbital sensor deploys a large L-band microwave detector comprised of 82 individual antenna elements. It can be used to study the water content of the upper soil layers and the salinity levels of large water features. Can only be used in low orbit. This instrument can also be used as a powerful communications antenna.
 attachRules = 1,0,1,1,0
 
 // --- standard part parameters ---
@@ -34,53 +34,78 @@ emissiveConstant = 0.95
 thermalMassModifier = 2.0
 heatConductivity = 0.04
 
-tags = experiment research rerun re-run reus re-us redo re-do reset re-set science dmagic dmos microwave asteroid water
+tags = experiment research rerun re-run reus re-us redo re-do reset re-set science dmagic dmos microwave asteroid water aerial antenna deploy direct dish extend fold radio signal transmi
 
 angularDrag = 2
 dragModelType = default
 maximum_drag = 0.2
 minimum_drag = 0.2
 
-MODULE
-{
-    name = DMSoilMoisture
-
-  	animationName = arrayDeploy
-
-    customFailMessage = The L-band microwave arrays are only meant to operate in low orbit.
-	animSpeed = 1
-
-	experimentAnimation = true	
-	experimentWaitForAnimation = true	
-	waitForAnimationTime = -1
-	keepDeployedMode = 2
-
-	startEventGUIName = Deploy Array
-	showStartEvent = false
-	endEventGUIName = Retract Array
-	showEndEvent = false
-	showEditorEvents = true
-	showToggleEvent = true
-	toggleEventGUIName = Toggle Array
+	MODULE
+	{
+		name = DMSoilMoisture
+
+		animationName = arrayDeploy
 
-  	experimentID = dmSoilMoisture
-	experimentLimit = 1
-   	xmitDataScalar = 1
+		customFailMessage = The L-band microwave arrays are only meant to operate in low orbit.
+		animSpeed = 1
+
+		experimentAnimation = true	
+		experimentWaitForAnimation = true	
+		waitForAnimationTime = -1
+		keepDeployedMode = 2
 
-	experimentActionName = Collect Soil Moisture Data
+		startEventGUIName = Deploy Array
+		showStartEvent = false
+		endEventGUIName = Retract Array
+		showEndEvent = false
+		showEditorEvents = true
+		showToggleEvent = true
+		toggleEventGUIName = Toggle Array
+
+		experimentID = dmSoilMoisture
+		experimentLimit = 1
+		xmitDataScalar = 1
+
+		experimentActionName = Collect Soil Moisture Data
+
+		useStaging = False	
+		useActionGroups = True
+		hideUIwhenUnavailable = False
+		rerunnable = True
 
-	useStaging = False	
-	useActionGroups = True
-	hideUIwhenUnavailable = False
-	rerunnable = True
+		dataIsCollectable = True
+		collectActionName = Take Data
+		interactionRange = 1.2
+		externalDeploy = True
+		usageReqMaskExternal = 8
+
+		asteroidReports = True
+		asteroidTypeDependent = True
+	}
 
-	dataIsCollectable = True
-	collectActionName = Take Data
-	interactionRange = 1.2
-	externalDeploy = True
-	usageReqMaskExternal = 8
-
-	asteroidReports = True
-	asteroidTypeDependent = True
-}
+	MODULE
+	{
+		name = ModuleDataTransmitter
+		antennaType = DIRECT
+		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
+			}
+		}
+	}
 }

GameData/DMagicOrbitalScience/Resources/DMAntennaUpgrade.cfg

@@ -0,0 +1,39 @@
+PARTUPGRADE
+{
+	name = dm_antenna_upgrade
+	partIcon = dm_antenna
+	techRequired = specializedElectrics
+	entryCost = 35000
+	cost = 0
+
+	title = DMagic Orbital Science Antenna Upgrade
+	basicInfo = Upgrades dual use antennas with signal boost and relay equipment.
+	manufacturer = DMagic
+	description = Some clever use of electronics allows these scientific instruments to be used for communication signal relays.
+}
+
+
+PART
+{
+	name = dm_antenna
+	module = Part
+	author = DMagic
+
+	MODEL
+	{
+		model = DMagicOrbitalScience/Resources/dm_antenna
+	}
+
+	rescaleFactor = 1
+
+	attachRules = 0,0,0,0,0
+
+	TechRequired = HIDDEN
+	entryCost = 0
+	cost = 0
+	category = -1
+	subcategory = 0
+	title = DM Upgrade
+	manufacturer = DMagic
+	description =  DM Upgrade	
+}