Merge pull request #29 from WaveFunctionP/development

WaveFunctionP · WaveFunctionP · commit b14982c060f4 · 2014-08-28T20:12:28.000-05:00
.12 patch
diff --git a/GameData/Interstellar/Parts/Electrical/AntimatterCollector/AntimatterCollector.cfg b/GameData/Interstellar/Parts/Electrical/AntimatterCollector/AntimatterCollector.cfg
@@ -11,7 +11,7 @@ rescaleFactor = 2
 node_stack_top = 0.0, 0.42856, 0.0, 0.0, 1.0, 0.0, 2
 node_stack_bottom = 0.0, -0.4357, 0.0, 0.0, 1.0, 0.0, 2
 
-TechRequired = experimentalScience
+TechRequired = interstellarTechAccelerator
 entryCost = 20000
 cost = 100000
 category = Utility
diff --git a/GameData/Interstellar/Parts/Electrical/AntimatterReactor/AntimatterReactor.cfg b/GameData/Interstellar/Parts/Electrical/AntimatterReactor/AntimatterReactor.cfg
@@ -11,7 +11,7 @@ node_stack_top = 0.0, 1.2665, 0.0, 0.0, 1.0, 0.0, 2
 node_stack_bottom = 0.0, -1.2665, 0.0, 0.0, 1.0, 0.0, 2
 node_attach = 0.0, 0.0, 1.4, 0.0, 0.0, -1.0, 1
 
-TechRequired = experimentalRocketry
+TechRequired = interstellarTechAntimatterPower
 entryCost = 16000
 cost = 160000
 category = Utility
diff --git a/GameData/Interstellar/Parts/Electrical/DeployableRadiator/DeployableRadiator.cfg b/GameData/Interstellar/Parts/Electrical/DeployableRadiator/DeployableRadiator.cfg
@@ -19,7 +19,7 @@ entryCost = 40
 cost = 400
 category = Utility
 subcategory = 0
-title = Small Heat Radiator
+title = Deployable Radiator
 manufacturer = Boltzkerman Co.
 description = Radiates heat into space via the Stefan-Boltzkerman law.
 // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
diff --git a/GameData/Interstellar/Parts/Electrical/FusionReactor/FusionReactor.cfg b/GameData/Interstellar/Parts/Electrical/FusionReactor/FusionReactor.cfg
@@ -17,7 +17,7 @@ node_stack_top = 0.0, 1.5, 0.0, 0.0, 1.0, 0.0, 2
 node_stack_bottom = 0.0, -1.5, 0.0, 0.0, 1.0, 0.0, 2
 node_attach = 1.25, 0.0, 0.0, 1.0, 0.0, 0.0, 1
 
-TechRequired = experimentalRocketry
+TechRequired = interstellarTechFusionPower
 entryCost = 8000
 cost = 80000
 category = Utility
diff --git a/GameData/Interstellar/Parts/Engines/Vista/Vista.cfg b/GameData/Interstellar/Parts/Engines/Vista/Vista.cfg
@@ -1,6 +1,6 @@
 PART
 {
-name = vista
+name = Vista
 module = Part
 author = Fractal
 
@@ -22,7 +22,7 @@ sound_rocket_hard = running
 sound_vent_soft = disengage
 sound_explosion_low = flameout
 
-TechRequired = experimentalRocketry
+TechRequired = interstellarTechFusionPower2
 entryCost = 200
 cost = 2000
 category = Propulsion
diff --git a/GameData/Interstellar/Parts/FuelTank/AntimatterTank/AntimatterTank.cfg b/GameData/Interstellar/Parts/FuelTank/AntimatterTank/AntimatterTank.cfg
@@ -10,7 +10,7 @@ rescaleFactor = 1.0
 node_stack_top = 0.0, 0.7231, 0.0, 0.0, 1.0, 0.0, 2
 node_stack_bottom = 0.0, -0.315, 0.0, 0.0, 1.0, 0.0, 2
 
-TechRequired = experimentalScience
+TechRequired = interstellarTechAccelerator
 entryCost = 200
 cost = 2000
 category = Propulsion
diff --git a/GameData/Interstellar/Parts/Utility/AtmosphericScoop/AtmosphericScoop.cfg b/GameData/Interstellar/Parts/Utility/AtmosphericScoop/AtmosphericScoop.cfg
@@ -1,7 +1,7 @@
 PART
 {
     // --- general parameters ---
-    name = Atmospheric Scoop
+    name = AtmosphericScoop
     module = Part
     author = zzz
 
diff --git a/GameData/Interstellar/Parts/Utility/DeployablePhasedArray/DeployablePhasedArray.cfg b/GameData/Interstellar/Parts/Utility/DeployablePhasedArray/DeployablePhasedArray.cfg
@@ -1,6 +1,6 @@
 PART
 {
-name = phasedArray1
+name = DeployablePhasedArray
 module = Part
 author = Fractal
 
diff --git a/GameData/Interstellar/Patches/KSPIEMMPatches.txt b/GameData/Interstellar/Patches/KSPIEMMPatches.txt
@@ -0,0 +1,51 @@
+@PART[DeployableRadiator]
+{
+	title = Deployable Radiator
+}
+
+@PART[Atmospheric Scoop]
+{
+	name = AtmosphericScoop
+}
+
+@PART[vista]
+{
+	name = Vista
+	TechRequied	= interstellarTechFusionPower2
+}
+
+@PART[FNDeuteriumCryostat]
+{
+	name = DeuteriumCryostat
+	!MODULE[ModuleElementRadioactiveDecay]
+}
+
+@PART[RVDeutTrit]
+{
+	!MODULE[ModuleElementRadioactiveDecay]
+}
+
+@PART[phasedArray1]
+{
+	name = DeployablePhasedArray
+}
+
+@PART[FusionReactor]
+{
+TechRequied	= interstellarTechFusionPower
+}
+
+@PART[AntimatterTank]
+{
+TechRequied	= interstellarTechAccelerator
+}
+
+@PART[AntimatterCollector]
+{
+TechRequied	= interstellarTechAccelerator
+}
+
+@PART[AntimatterReactor]
+{
+TechRequied	= interstellarTechAntimatterPower
+}
diff --git a/GameData/Interstellar/tree.cfg b/GameData/Interstellar/tree.cfg
diff --git a/InterstellarPlugin/PluginHelper.cs b/InterstellarPlugin/PluginHelper.cs
diff --git a/OpenResourceSystem/ORSPlanetaryResourceMapData.cs b/OpenResourceSystem/ORSPlanetaryResourceMapData.cs
diff --git a/OpenResourceSystem/ORSResourceScanner.cs b/OpenResourceSystem/ORSResourceScanner.cs

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`PART`
`2`	`2`	`{`
`3`	`3`	`// --- general parameters ---`
`4`		`- name = Atmospheric Scoop`
	`4`	`+ name = AtmosphericScoop`
`5`	`5`	`module = Part`
`6`	`6`	`author = zzz`
`7`	`7`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`PART`
`2`	`2`	`{`
`3`		`-name = phasedArray1`
	`3`	`+name = DeployablePhasedArray`
`4`	`4`	`module = Part`
`5`	`5`	`author = Fractal`
`6`	`6`