Merge pull request #90 from DMagic1/dev

Version 1.4.1

GameData/DMagicOrbitalScience/Change Log.txt

@@ -1,4 +1,7 @@
-v1.4
+v1.4.1
+- Fixed problems with parts that consume Electricity or other resources
+
+v1.4
 - Update for Universal Storage II
     - New versions of Orbital Science parts for Universal Storage
 	- Stock science parts no longer available for US (will be added by US at a later date)

GameData/DMagicOrbitalScience/DMagicOrbitalScience.version

@@ -10,7 +10,7 @@
      "VERSION":{
          "MAJOR":1,
          "MINOR":4,
-         "PATCH":0,
+         "PATCH":1,
          "BUILD":0
      },
      "KSP_VERSION":{

GameData/DMagicOrbitalScience/ProbeScience/ASERT/ASERT.cfg

@@ -1,69 +1,73 @@
 PART
 {
-name = dmASERT
-module = Part
-author = DMagic
-
-MODEL
-{
-	model = DMagicOrbitalScience/ProbeScience/ASERT/modelASERT
-	scale = 0.7, 0.7, 0.7
-}
-
-rescaleFactor = 1
-
-node_attach = 0.0, -0.056, 0.0, 0.0, -1.0, 0.0
-attachRules = 0,1,0,0,0
-
-TechRequired = actuators
-entryCost = 20000
-cost = 6500
-category = Science
-subcategory = 0
-title = Asteroid Sounding Experiment by Radiowave Transmission
-manufacturer = DMagic
-description = The ASERT is an asteroid-only experiment used to study the interior composition of asteroids. It must be paired with a second module placed on the opposite side of an asteroid. When two modules are properly positioned the experiment can be conducted with the science amount dependent on how much of the asteroid the signal passed through.
-
-// --- standard part parameters ---
-mass = 0.02
-bulkheadProfiles = srf
-crashTolerance = 10
-maxTemp = 1400
-emissiveConstant = 0.85
-thermalMassModifier = 4.0
+	name = dmASERT
+	module = Part
+	author = DMagic
 
-angularDrag = 1
-dragModelType = default
-maximum_drag = 0.1
-minimum_drag = 0.1
-
-tags = experiment research rerun re-run reus re-us redo re-do reset re-set science dmagic dmos asteroid sounding
-
-MODULE
-{
-	name=ModuleAsteroidAnalysis
-}
-
-MODULE
-{
-	name=ModuleAnalysisResource
-	resourceName = Ore
-}
-
-MODULE
+	MODEL
 	{
-   	name = DMAsteroidScanner
-	animationName = dishDeploy
-	greenLight = greenAnim
-	yellowLight = yellowAnim
+		model = DMagicOrbitalScience/ProbeScience/ASERT/modelASERT
+		scale = 0.7, 0.7, 0.7
+	}
+
+	rescaleFactor = 1
+
+	node_attach = 0.0, -0.056, 0.0, 0.0, -1.0, 0.0
+	attachRules = 0,1,0,0,0
+
+	TechRequired = actuators
+	entryCost = 20000
+	cost = 6500
+	category = Science
+	subcategory = 0
+	title = Asteroid Sounding Experiment by Radiowave Transmission
+	manufacturer = DMagic
+	description = The ASERT is an asteroid-only experiment used to study the interior composition of asteroids. It must be paired with a second module placed on the opposite side of an asteroid. When two modules are properly positioned the experiment can be conducted with the science amount dependent on how much of the asteroid the signal passed through.
 
-	experimentID = dmAsteroidScan
-	rerunnable = True	
-	transmitValue = 1.0
-	dataIsCollectable = True
-	collectActionName = Take Data
-	experimentResource = ElectricCharge
-	resourceCost = 0.25
-	usageReqMaskExternal = 8
+	// --- standard part parameters ---
+	mass = 0.02
+	bulkheadProfiles = srf
+	crashTolerance = 10
+	maxTemp = 1400
+	emissiveConstant = 0.85
+	thermalMassModifier = 4.0
+
+	angularDrag = 1
+	dragModelType = default
+	maximum_drag = 0.1
+	minimum_drag = 0.1
+
+	tags = experiment research rerun re-run reus re-us redo re-do reset re-set science dmagic dmos asteroid sounding
+
+	MODULE
+	{
+		name=ModuleAsteroidAnalysis
+	}
+
+	MODULE
+	{
+		name=ModuleAnalysisResource
+		resourceName = Ore
+	}
+
+	MODULE
+	{
+		name = DMAsteroidScanner
+		animationName = dishDeploy
+		greenLight = greenAnim
+		yellowLight = yellowAnim
+
+		experimentID = dmAsteroidScan
+		rerunnable = True	
+		transmitValue = 1.0
+		dataIsCollectable = True
+		collectActionName = Take Data
+		usageReqMaskExternal = 8
+
+		RESOURCE
+		{
+			name	= ElectricCharge
+			rate	= 0.25
+		}	
 	}
 }

GameData/DMagicOrbitalScience/ProbeScience/MagBoom/MagBoom.cfg

@@ -1,106 +1,110 @@
 PART
 {
-name = dmmagBoom
-module = Part
-author = DMagic
-
-MODEL
-{
-	model = DMagicOrbitalScience/ProbeScience/MagBoom/modelMagBoom
-}
-
-scale = 1
-rescaleFactor = 1
-
-node_stack_bottom = 0.0, -0.195, 0.0, 0.0, -1.0, 0.0, 0
-node_attach = 0.0, -0.160, 0.0, 0.0, -1.0, 0.0, 0
-
-TechRequired = engineering101
-entryCost = 3000
-cost = 1000
-category = Science
-subcategory = 0
-title = Magnetometer Boom
-manufacturer = DMagic
-description = The magnetometer instruments are used to determine the magnitude and direction of planetary magnetic fields. The long boom separates these instruments from any interference caused by magnetic elements in the probe. Use in low to high orbit or on the surface. Not for use during atmospheric flight.
-attachRules = 1,1,0,0,0
-
-// --- standard part parameters ---
-mass = 0.015
-bulkheadProfiles = size0, srf
-crashTolerance = 10
-maxTemp = 1200
-emissiveConstant = 0.85
-thermalMassModifier = 4.0
-
-tags = experiment research rerun re-run reus re-us redo re-do reset re-set science dmagic dmos (mag field asteroid
+	name = dmmagBoom
+	module = Part
+	author = DMagic
 
-angularDrag = 1
-dragModelType = default
-maximum_drag = 0.1
-minimum_drag = 0.1
-
-MODULE
+	MODEL
+	{
+		model = DMagicOrbitalScience/ProbeScience/MagBoom/modelMagBoom
+	}
+
+	scale = 1
+	rescaleFactor = 1
+
+	node_stack_bottom = 0.0, -0.195, 0.0, 0.0, -1.0, 0.0, 0
+	node_attach = 0.0, -0.160, 0.0, 0.0, -1.0, 0.0, 0
+
+	TechRequired = engineering101
+	entryCost = 3000
+	cost = 1000
+	category = Science
+	subcategory = 0
+	title = Magnetometer Boom
+	manufacturer = DMagic
+	description = The magnetometer instruments are used to determine the magnitude and direction of planetary magnetic fields. The long boom separates these instruments from any interference caused by magnetic elements in the probe. Use in low to high orbit or on the surface. Not for use during atmospheric flight.
+	attachRules = 1,1,0,0,0
+
+	// --- standard part parameters ---
+	mass = 0.015
+	bulkheadProfiles = size0, srf
+	crashTolerance = 10
+	maxTemp = 1200
+	emissiveConstant = 0.85
+	thermalMassModifier = 4.0
+
+	tags = experiment research rerun re-run reus re-us redo re-do reset re-set science dmagic dmos (mag field asteroid
+
+	angularDrag = 1
+	dragModelType = default
+	maximum_drag = 0.1
+	minimum_drag = 0.1
+
+	MODULE
 	{
 		name = ModuleResourceScanner
 		MaxAbundanceAltitude = 60000
 		RequiresUnlock = True
 		ScannerType = 0
 		ResourceName = Ore
 	}
-
-MODULE
-	{
-    name = DMModuleScienceAnimate
-
-	animationName = magBoom	
-
-	experimentID = magScan
 
-	experimentAnimation = true					
-	experimentWaitForAnimation = true	
-	waitForAnimationTime = -1	
-	keepDeployedMode = 2
+	MODULE
+	{
+		name = DMModuleScienceAnimate
 
-	deployingMessage = Close proximity to the craft scrambles the magnetometer's sensors, deploying the scanner now.
-	customFailMessage = The magnetometer is not suitable for use during atmospheric flight, try again on the ground or in space.
+		animationName = magBoom	
+
+		experimentID = magScan
 
-	animSpeed = 2
-	endEventGUIName = Retract Magnetometer	
-	showEndEvent = false				
-	startEventGUIName = Deploy Magnetometer	
-	showStartEvent = false			
-	toggleEventGUIName = Toggle Magnetometer
-	showToggleEvent = true			
-	showEditorEvents = true
-	
-	experimentActionName = Log Magnetometer Data
-	resetActionName = Discard Magnetometer Data	
+		experimentAnimation = true					
+		experimentWaitForAnimation = true	
+		waitForAnimationTime = -1	
+		keepDeployedMode = 2
+
+		deployingMessage = Close proximity to the craft scrambles the magnetometer's sensors, deploying the scanner now.
+		customFailMessage = The magnetometer is not suitable for use during atmospheric flight, try again on the ground or in space.
+			
+		animSpeed = 2
+		endEventGUIName = Retract Magnetometer	
+		showEndEvent = false				
+		startEventGUIName = Deploy Magnetometer	
+		showStartEvent = false			
+		toggleEventGUIName = Toggle Magnetometer
+		showToggleEvent = true			
+		showEditorEvents = true
+		
+		experimentActionName = Log Magnetometer Data
+		resetActionName = Discard Magnetometer Data	
+		
+		useStaging = False	
+		useActionGroups = True
+		hideUIwhenUnavailable = False
+		rerunnable = True
+		
+		xmitDataScalar = 1.0
 	
-	useStaging = False	
-	useActionGroups = True
-	hideUIwhenUnavailable = False
-	rerunnable = True
+		dataIsCollectable = True
+		collectActionName = Take Data
+		interactionRange = 1.2
+		externalDeploy = True
+		usageReqMaskExternal = 8
 	
-	xmitDataScalar = 1.0
-
-	dataIsCollectable = True
-	collectActionName = Take Data
-	interactionRange = 1.2
-	externalDeploy = True
-	usageReqMaskExternal = 8
-
-	asteroidReports = True
-	asteroidTypeDependent = True
+		asteroidReports = True
+		asteroidTypeDependent = True
 	}
-
+	
 	MODULE
 	{
-	name = DMMagBoomModule
-	
-	runMagnetometer = True
-	resourceToUse = ElectricCharge
-	resourceCost = 0.05
+		name = DMMagBoomModule
+		
+		runMagnetometer = True
+		
+		RESOURCE
+		{
+			name	= ElectricCharge
+			rate	= 0.05
+		}	
 	}
 }