Merge pull request #64 from DMagic1/dev

Version 1.3.3
DMagic1 · Oct 14, 2016 · 7e1cc8b · 7e1cc8b
2 parents 0df1823 + 5253ed5
commit 7e1cc8b
Show file tree

Hide file tree

Showing 40 changed files with 855 additions and 234 deletions.
diff --git a/GameData/DMagicOrbitalScience/Change Log.txt b/GameData/DMagicOrbitalScience/Change Log.txt
@@ -1,4 +1,26 @@
-v1.3.2
+v1.3.3
+- Update for KSP 1.2
+
+- Add data transfer function to all parts
+- Support CommNet
+    - Experiments respect CommNet antenna selection
+	- SIGINT dish works as a long range Direct transmitter
+- Detect new anomaly types
+- Add KerbNet Modules
+    - Terrain for Basic Orbital Telescope 
+	- Terrain, Biomes and Anomalies for the Imaging Platform
+	- Terrain and Anomalies for the Recon Telescopes
+
+- Fixed error with out-of-power data return to recon telescopes
+- Add toggle for asteroid scanner targetting line
+- Add support for Science Relay data transmission
+- Fix some error with asteroid science values not taking the Science multiplier into account
+- Fix some errors with recon contract orbits
+- Remove EC usage from Universal Storage environmental sensors
+- Support new SCANsat EC usage
+- Various KSP 1.2-related updates and bug fixes
+
+v1.3.2
 - Fixes a bug related to recon contracts
 
 v1.3.1

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://spacedock.info/mod/128/DMagic%20Orbital%20Science/download/1.3.2",
+     "DOWNLOAD":"https://spacedock.info/mod/128/DMagic%20Orbital%20Science/download/1.3.3",
      "GITHUB":{
          "USERNAME":"DMagic1",
          "REPOSITORY":"Orbital-Science",
@@ -11,21 +11,21 @@
          "MAJOR":1,
          "MINOR":3,
          "PATCH":0,
-         "BUILD":2
+         "BUILD":3
      },
      "KSP_VERSION":{
          "MAJOR":1,
-         "MINOR":1,
-         "PATCH":3
+         "MINOR":2,
+         "PATCH":0
      },
      "KSP_VERSION_MIN":{
          "MAJOR":1,
-         "MINOR":1,
-         "PATCH":3
+         "MINOR":2,
+         "PATCH":0
      },
      "KSP_VERSION_MAX":{
          "MAJOR":1,
-         "MINOR":1,
-         "PATCH":3
+         "MINOR":2,
+         "PATCH":0
      }
  } 
diff --git a/GameData/DMagicOrbitalScience/OversizeScience/LargeRecon.cfg b/GameData/DMagicOrbitalScience/OversizeScience/LargeRecon.cfg
@@ -53,6 +53,18 @@ dragModelType = default
 maximum_drag = 0.2
 minimum_drag = 0.2
 
+MODULE
+{
+	name = ModuleKerbNetAccess
+	MinimumFoV = 5
+	MaximumFoV = 80
+	AnomalyDetection = 0.8
+	DISPLAY_MODES
+	{
+		Mode = Terrain
+	}
+}
+
 MODULE
 	{
 		name = DMReconScope

diff --git a/GameData/DMagicOrbitalScience/OversizeScience/SIGINT.cfg b/GameData/DMagicOrbitalScience/OversizeScience/SIGINT.cfg
@@ -108,10 +108,13 @@ DRAG_CUBE
 		MODULE
 	{
 		name = ModuleDataTransmitter
+		antennaType = DIRECT
 		packetInterval = 0.08
 		packetSize = 4
 		packetResourceCost = 55.0
 		requiredResource = ElectricCharge
 		DeployFxModules = 0
+		antennaPower = 1000000000000
+		antennaCombinable = False
 	}
 }
diff --git a/GameData/DMagicOrbitalScience/OversizeScience/SIGINT_End.cfg b/GameData/DMagicOrbitalScience/OversizeScience/SIGINT_End.cfg
@@ -107,11 +107,14 @@ DRAG_CUBE
 		MODULE
 	{
 		name = ModuleDataTransmitter
+		antennaType = DIRECT
 		packetInterval = 0.08
 		packetSize = 4
 		packetResourceCost = 55.0
 		requiredResource = ElectricCharge
 		DeployFxModules = 0
+		antennaPower = 1000000000000
+		antennaCombinable = False
 	}
 	
 	MODULE

diff --git a/GameData/DMagicOrbitalScience/OversizeScience/SIGINT_Small.cfg b/GameData/DMagicOrbitalScience/OversizeScience/SIGINT_Small.cfg
@@ -110,10 +110,13 @@ DRAG_CUBE
 		MODULE
 	{
 		name = ModuleDataTransmitter
+		antennaType = DIRECT
 		packetInterval = 0.1
 		packetSize = 2
 		packetResourceCost = 20.0
 		requiredResource = ElectricCharge
 		DeployFxModules = 0
+		antennaPower = 10000000000
+		antennaCombinable = False
 	}
 }
diff --git a/GameData/DMagicOrbitalScience/OversizeScience/SmallRecon.cfg b/GameData/DMagicOrbitalScience/OversizeScience/SmallRecon.cfg
@@ -53,6 +53,18 @@ dragModelType = default
 maximum_drag = 0.2
 minimum_drag = 0.2
 
+MODULE
+{
+	name = ModuleKerbNetAccess
+	MinimumFoV = 8
+	MaximumFoV = 60
+	AnomalyDetection = 0.4
+	DISPLAY_MODES
+	{
+		Mode = Terrain
+	}
+}
+
 MODULE
 	{
 		name = DMReconScope

diff --git a/GameData/DMagicOrbitalScience/ProbeScience/ImagingPlatform/ImagingPlatform.cfg b/GameData/DMagicOrbitalScience/ProbeScience/ImagingPlatform/ImagingPlatform.cfg
@@ -46,7 +46,15 @@ MODULE
 
 MODULE
 {
-	name = ModuleHighDefCamera
+	name = ModuleKerbNetAccess
+	MinimumFoV = 30
+	MaximumFoV = 65
+	AnomalyDetection = 0.35
+	DISPLAY_MODES
+	{
+		Mode = Biome
+		Mode = Terrain
+	}
 }
 
 MODULE

diff --git a/GameData/DMagicOrbitalScience/ProbeScience/Scope/Scope.cfg b/GameData/DMagicOrbitalScience/ProbeScience/Scope/Scope.cfg
@@ -41,6 +41,17 @@ dragModelType = default
 maximum_drag = 0.2
 minimum_drag = 0.2
 
+MODULE
+	{
+		name = ModuleKerbNetAccess
+		MinimumFoV = 15
+		MaximumFoV = 35
+		AnomalyDetection = 0
+		DISPLAY_MODES
+		{
+			Mode = Terrain
+		}
+	}
 
 MODULE
 {

diff --git a/GameData/DMagicOrbitalScience/Resources/DMagicSCANsatScanner.cfg b/GameData/DMagicOrbitalScience/Resources/DMagicSCANsatScanner.cfg
@@ -13,8 +13,12 @@ Magnetometer Ore Scanner
 		min_alt = 30000
 		max_alt = 60000
 		best_alt = 50000
-		power = 0.75
 		scanName = Ore scan
+		RESOURCE
+		{
+			name = ElectricCharge
+			rate = 0.5
+		}
 	}
 
 	MODULE
@@ -38,8 +42,12 @@ Universal Storage Magnetometer Ore Scanner
 		min_alt = 30000
 		max_alt = 60000
 		best_alt = 50000
-		power = 0.75
 		scanName = Ore scan
+		RESOURCE
+		{
+			name = ElectricCharge
+			rate = 0.5
+		}
 	}
 
 	MODULE
@@ -63,8 +71,12 @@ Universal Storage Magnetometer Ore Scanner
 		min_alt = 5000
 		max_alt = 500000
 		best_alt = 250000
-		power = 1.5
 		scanName = Multi-Spectral scan
+		RESOURCE
+		{
+			name = ElectricCharge
+			rate = 1.5
+		}
 	}
 }
 
@@ -91,8 +103,12 @@ Universal Storage Magnetometer Ore Scanner
 		min_alt = 50000
 		max_alt = 300000
 		best_alt = 200000
-		power = 1.0
 		scanName = Minerals scan
+		RESOURCE
+		{
+			name = ElectricCharge
+			rate = 0.5
+		}
 	}
 
 	MODULE
@@ -116,8 +132,12 @@ Universal Storage Magnetometer Ore Scanner
 		min_alt = 5000
 		max_alt = 500000
 		best_alt = 250000
-		power = 1.5
 		scanName = Multi-Spectral scan
+		RESOURCE
+		{
+			name = ElectricCharge
+			rate = 1.5
+		}
 	}
 }
 
@@ -144,8 +164,12 @@ Universal Storage Magnetometer Ore Scanner
 		min_alt = 50000
 		max_alt = 300000
 		best_alt = 200000
-		power = 1.0
 		scanName = Minerals scan
+		RESOURCE
+		{
+			name = ElectricCharge
+			rate = 0.5
+		}
 	}
 
 	MODULE
@@ -196,8 +220,12 @@ Soil Moisture Resource and SCANsat Water Scanner
 		min_alt = 50000
 		max_alt = 500000
 		best_alt = 250000
-		power = 1.5
 		scanName = Water scan
+		RESOURCE
+		{
+			name = ElectricCharge
+			rate = 1.0
+		}
 	}
 
 	MODULE
@@ -248,8 +276,12 @@ Universal Storage Soil Moisture Resource and SCANsat Water Scanner
 		min_alt = 50000
 		max_alt = 500000
 		best_alt = 250000
-		power = 1.5
 		scanName = Water scan
+		RESOURCE
+		{
+			name = ElectricCharge
+			rate = 1.0
+		}
 	}
 
 	MODULE
@@ -273,7 +305,11 @@ Universal Storage Soil Moisture Resource and SCANsat Water Scanner
 		min_alt = 0
 		max_alt = 2000
 		best_alt = 0
-		power = 0.1
 		scanName = BTDT scan
+		RESOURCE
+		{
+			name = ElectricCharge
+			rate = 0.1
+		}
 	}
 }
diff --git a/GameData/DMagicOrbitalScience/Resources/dmorbitalsci.ksp b/GameData/DMagicOrbitalScience/Resources/dmorbitalsci.ksp
diff --git a/GameData/DMagicOrbitalScience/UniversalStorage/USImagingPlatform/USImagingPlatform.cfg b/GameData/DMagicOrbitalScience/UniversalStorage/USImagingPlatform/USImagingPlatform.cfg
@@ -59,7 +59,15 @@ MODULE
 
 MODULE
 {
-	name = ModuleHighDefCamera
+	name = ModuleKerbNetAccess
+	MinimumFoV = 30
+	MaximumFoV = 65
+	AnomalyDetection = 0.35
+	DISPLAY_MODES
+	{
+		Mode = Biome
+		Mode = Terrain
+	}
 }
 
 MODULE

diff --git a/GameData/DMagicOrbitalScience/UniversalStorage/USScope/USScope.cfg b/GameData/DMagicOrbitalScience/UniversalStorage/USScope/USScope.cfg
@@ -50,6 +50,17 @@ tags = experiment research rerun re-run reus re-us redo re-do reset re-set scien
 angularDrag = 1
 dragModelType = default
 
+MODULE
+	{
+		name = ModuleKerbNetAccess
+		MinimumFoV = 15
+		MaximumFoV = 35
+		AnomalyDetection = 0
+		DISPLAY_MODES
+		{
+			Mode = Terrain
+		}
+	}
 
 MODULE
 	{

diff --git a/GameData/DMagicOrbitalScience/UniversalStorage/USStock/ACCGRAV.cfg b/GameData/DMagicOrbitalScience/UniversalStorage/USStock/ACCGRAV.cfg
@@ -55,7 +55,6 @@ MODULE
 	min = 25
 	max = 335
 	primary = True
-	powerConsumption = 0.2
 	}
 
 MODULE
@@ -65,7 +64,6 @@ MODULE
 	min = 0
 	max = 5
 	primary = False
-	powerConsumption = 0
 	}
 
 MODULE

diff --git a/GameData/DMagicOrbitalScience/UniversalStorage/USStock/PRESTEMP.cfg b/GameData/DMagicOrbitalScience/UniversalStorage/USStock/PRESTEMP.cfg
@@ -54,7 +54,6 @@ MODULE
 	min = 0
 	max = 1
 	primary = True
-	powerConsumption = 0.2
 	}
 
 MODULE
@@ -64,7 +63,6 @@ MODULE
 	min = 25
 	max = 335
 	primary = False
-	powerConsumption = 0
 	}
 
 MODULE

diff --git a/Source/Contracts/DMMagneticSurveyContract.cs b/Source/Contracts/DMMagneticSurveyContract.cs
@@ -191,7 +191,7 @@ protected override bool Generate()
 			double inclination = incMod * ((double)rand.Next(7, 14) / 10d);
 			if (inclination > 75) inclination = 75;
 
-			Dictionary<int, List<string>> parts = new Dictionary<int, List<string>>();
+			DictionaryValueList<int, List<string>> parts = new DictionaryValueList<int, List<string>>();
 			parts.Add(0, DMContractDefs.DMMagnetic.magParts);
 			parts.Add(1, DMContractDefs.DMMagnetic.rpwsParts);
 
@@ -245,7 +245,7 @@ protected override bool Generate()
 				this.agent = AgentList.Instance.GetAgentRandom();
 
 			base.SetExpiry(DMContractDefs.DMMagnetic.Expire.MinimumExpireDays, DMContractDefs.DMMagnetic.Expire.MaximumExpireDays);
-			base.SetDeadlineDays((float)(time / ((KSPUtil.DefaultDateTimeFormatter)KSPUtil.dateTimeFormatter).KerbinDay) * DMContractDefs.DMMagnetic.Expire.DeadlineModifier * (this.GetDestinationWeight(body) / 1.8f) * primaryModifier, null);
+			base.SetDeadlineDays((float)(time / 3600) * DMContractDefs.DMMagnetic.Expire.DeadlineModifier * (this.GetDestinationWeight(body) / 1.8f) * primaryModifier, null);
 			base.SetReputation(DMContractDefs.DMMagnetic.Reputation.BaseReward * Mod, DMContractDefs.DMMagnetic.Reputation.BaseFailure * Mod, null);
 			base.SetFunds(DMContractDefs.DMMagnetic.Funds.BaseAdvance * Mod, DMContractDefs.DMMagnetic.Funds.BaseReward * Mod, DMContractDefs.DMMagnetic.Funds.BaseFailure * Mod, body);
 			base.SetScience(DMContractDefs.DMMagnetic.Science.BaseReward * Mod, body);