Merge pull request #86 from BobPalmer/DEVELOP

Develop
UmbraSpaceIndustries · May 15, 2015 · d1bbadc · d1bbadc
2 parents 625a8bf + 0da0c52
commit d1bbadc
Show file tree

Hide file tree

Showing 14 changed files with 133 additions and 35 deletions.
diff --git a/GameData/000_USITools/USI.version b/GameData/000_USITools/USI.version
@@ -10,13 +10,13 @@
      "VERSION":{
          "MAJOR":0,
          "MINOR":4,
-         "PATCH":0,
+         "PATCH":1,
          "BUILD":0
      },
      "KSP_VERSION":{
          "MAJOR":1,
          "MINOR":0,
-         "PATCH":0
+         "PATCH":2
      },
      "KSP_VERSION_MIN":{
          "MAJOR":1,
@@ -26,6 +26,6 @@
      "KSP_VERSION_MAX":{
          "MAJOR":1,
          "MINOR":0,
-         "PATCH":0
+         "PATCH":2
      }
  } 
diff --git a/GameData/000_USITools/USITools.dll b/GameData/000_USITools/USITools.dll
diff --git a/GameData/CommunityResourcePack/CRP.version b/GameData/CommunityResourcePack/CRP.version
@@ -9,23 +9,23 @@
      },
      "VERSION":{
          "MAJOR":0,
-         "MINOR":3,
-         "PATCH":3,
+         "MINOR":4,
+         "PATCH":2,
          "BUILD":0
      },
      "KSP_VERSION":{
-         "MAJOR":0,
-         "MINOR":90,
-         "PATCH":0
+         "MAJOR":1,
+         "MINOR":0,
+         "PATCH":2
      },
      "KSP_VERSION_MIN":{
-         "MAJOR":0,
-         "MINOR":24,
-         "PATCH":2
+         "MAJOR":1,
+         "MINOR":0,
+         "PATCH":0
      },
      "KSP_VERSION_MAX":{
-         "MAJOR":0,
-         "MINOR":90,
-         "PATCH":0
+         "MAJOR":1,
+         "MINOR":0,
+         "PATCH":2
      }
  } 
diff --git a/GameData/CommunityResourcePack/CommonResources.cfg b/GameData/CommunityResourcePack/CommonResources.cfg
@@ -13,7 +13,7 @@ RESOURCE_DEFINITION
 	flowMode = ALL_VESSEL
 	transfer = PUMP
 	isTweakable = true
-	unitCost = 0
+	unitCost = 0.0000028637
 }
 
 RESOURCE_DEFINITION
@@ -88,6 +88,16 @@ RESOURCE_DEFINITION
 	isTweakable = true
 }
 
+RESOURCE_DEFINITION
+{
+  	name = LqdCO
+  	density = 0.000790
+  	unitCost = 0.0021
+  	flowMode = STACK_PRIORITY_SEARCH
+  	transfer = PUMP
+  	isTweakable = true
+}
+
 RESOURCE_DEFINITION
 {
 	name = Metals
@@ -164,8 +174,8 @@ RESOURCE_DEFINITION
 RESOURCE_DEFINITION
 {
     name = RocketParts
-    density = 0.0005
-    unitCost = 1
+    density = 0.0025
+    unitCost = 5
     flowMode = ALL_VESSEL 
 	transfer = PUMP
     isTweakable = true
@@ -335,11 +345,11 @@ RESOURCE_DEFINITION
 RESOURCE_DEFINITION
 {
 	name = Antimatter
-	density = 0.00007085
+	density = 0.000000001
 	flowMode = STAGE_PRIORITY_FLOW
 	transfer = PUMP
-	isTweakable = true
-	unitCost = 150000
+	isTweakable = false
+	unitCost = 100
 }
 
 RESOURCE_DEFINITION
@@ -402,6 +412,16 @@ RESOURCE_DEFINITION
 	unitCost = 0.0068
 }
 
+RESOURCE_DEFINITION
+{
+   name = NeonGas
+   density = 0.0000009002
+   flowMode = STAGE_PRIORITY_FLOW
+   transfer = PUMP
+   isTweakable = true
+   unitCost = 0.0016
+}
+
 RESOURCE_DEFINITION
 {
 	name = Lithium
@@ -502,6 +522,16 @@ RESOURCE_DEFINITION
 	unitCost = 716
 }
 
+RESOURCE_DEFINITION
+{
+ 	name = ThermalPower
+  	density = 0
+  	unitCost = 0
+  	flowMode = ALL_VESSEL
+  	transfer = NONE
+  	isTweakable = false
+}
+
 RESOURCE_DEFINITION
 {
 	name = UraniumNitride
@@ -515,7 +545,7 @@ RESOURCE_DEFINITION
 RESOURCE_DEFINITION
 {
 	name = VacuumPlasma
-	density = 0
+	density = 0.005
 	flowMode = ALL_VESSEL
 	transfer = NONE
 	isTweakable = false

diff --git a/GameData/CommunityResourcePack/ResourceConfigs/CarbonDioxide.cfg b/GameData/CommunityResourcePack/ResourceConfigs/CarbonDioxide.cfg
@@ -0,0 +1,68 @@
+//
+//	Community Resource Pack
+//	Resource:
+//
+//Resource types:  
+//	0 = Crustal			(Stuff you dig up)
+//	1 = Oceanic			(Stuff in the oceans)
+//	2 = Atmospheric		(Stuff in the air, varies with pressure)
+//	3 = Interplanetary	(Stuff you find between planets)
+//
+//Express all numbers as percentages 0.0-100.0, not 0.0-1.0!
+//
+PLANETARY_RESOURCE
+{
+	ResourceName = CarbonDioxide
+	ResourceType = 2
+	PlanetName = Eve
+
+	Distribution
+	{
+		PresenceChance = 100
+		MinAbundance = 95
+		MaxAbundance = 97
+		Variance = 0
+	}
+}
+PLANETARY_RESOURCE
+{
+	ResourceName = CarbonDioxide
+	ResourceType = 2
+	PlanetName = Kerbin
+
+	Distribution
+	{
+		PresenceChance = 100
+		MinAbundance = 1
+		MaxAbundance = 2
+		Variance = 0
+	}
+}
+PLANETARY_RESOURCE
+{
+	ResourceName = CarbonDioxide
+	ResourceType = 2
+	PlanetName = Duna
+
+	Distribution
+	{
+		PresenceChance = 100
+		MinAbundance = 95
+		MaxAbundance = 97
+		Variance = 0
+	}
+}
+PLANETARY_RESOURCE
+{
+	ResourceName = CarbonDioxide
+	ResourceType = 2
+	PlanetName = Laythe
+
+	Distribution
+	{
+		PresenceChance = 100
+		MinAbundance = 5
+		MaxAbundance = 10
+		Variance = 0
+	}
+}
diff --git a/GameData/Firespitter/Firespitter.version b/GameData/Firespitter/Firespitter.version
@@ -3,12 +3,12 @@
   "URL": "https://raw.githubusercontent.com/snjo/Firespitter/master/For%20release/Firespitter/Firespitter.version",
   "VERSION": {
     "MAJOR": 7,
-    "MINOR": 0,
-	"PATCH": 0
+    "MINOR": 1,
+	"PATCH": 2
   },
   "KSP_VERSION": {
-    "MAJOR": 0,
-    "MINOR": 90,
-    "PATCH": 0
+    "MAJOR": 1,
+    "MINOR": 0,
+    "PATCH": 2
   }
-}
+}
diff --git a/GameData/Firespitter/Plugins/Firespitter.dll b/GameData/Firespitter/Plugins/Firespitter.dll
diff --git a/GameData/ModuleManager.2.6.2.dll b/GameData/ModuleManager.2.6.2.dll
diff --git a/GameData/UmbraSpaceIndustries/FTT/FTT.version b/GameData/UmbraSpaceIndustries/FTT/FTT.version
@@ -10,13 +10,13 @@
      "VERSION":{
          "MAJOR":0,
          "MINOR":4,
-         "PATCH":0,
+         "PATCH":1,
          "BUILD":0
      },
      "KSP_VERSION":{
          "MAJOR":1,
          "MINOR":0,
-         "PATCH":0
+         "PATCH":2
      },
      "KSP_VERSION_MIN":{
          "MAJOR":1,
@@ -26,6 +26,6 @@
      "KSP_VERSION_MAX":{
          "MAJOR":1,
          "MINOR":0,
-         "PATCH":0
+         "PATCH":2
      }
  } 
diff --git a/GameData/UmbraSpaceIndustries/FTT/Parts/FTT_Cargo_375_01.cfg b/GameData/UmbraSpaceIndustries/FTT/Parts/FTT_Cargo_375_01.cfg
@@ -60,7 +60,7 @@ MODULE
 {
   name = FSfuelSwitch
   resourceNames = MetallicOre;Water;Substrate;Minerals;Karbonite;LiquidFuel,Oxidizer;MonoPropellant;Uraninite;RocketParts
-  resourceAmounts =        15000;15000;15000;15000;15000;1350,1650;15000;15000;15000
+  resourceAmounts =        15000;15000;15000;15000;15000;1350,1650;15000;15000;3000
   initialResourceAmounts = 0;0;0;0;0;0,0;0;0;0
   tankCost = 10500;12;4500;12000;4800;1377;3600;10500;15000
 	basePartMass = 0.5

diff --git a/GameData/UmbraSpaceIndustries/FTT/Parts/FTT_Cargo_375_02.cfg b/GameData/UmbraSpaceIndustries/FTT/Parts/FTT_Cargo_375_02.cfg
@@ -71,7 +71,7 @@ MODULE
 {
   name = FSfuelSwitch
   resourceNames = MetallicOre;Water;Substrate;Minerals;Karbonite;LiquidFuel,Oxidizer;MonoPropellant;Uraninite;RocketParts
-  resourceAmounts = 45000;45000;45000;45000;45000;4050,4950;45000;45000;45000
+  resourceAmounts = 45000;45000;45000;45000;45000;4050,4950;45000;45000;9000
   initialResourceAmounts = 0;0;0;0;0;0,0;0;0;0
   tankCost = 31500;36;13500;36000;14400;4131;10800;31500;45000
   basePartMass = 1.5

diff --git a/GameData/UmbraSpaceIndustries/FTT/Parts/FTT_Kontainer_01.cfg b/GameData/UmbraSpaceIndustries/FTT/Parts/FTT_Kontainer_01.cfg
@@ -64,7 +64,7 @@ MODULE
 {
   name = FSfuelSwitch
   resourceNames = MetallicOre;Water;Substrate;Minerals;Karbonite;LiquidFuel,Oxidizer;RocketParts;Metals;Chemicals;Polymers
-  resourceAmounts = 45000;45000;45000;45000;45000;4050,4950;45000;45000;45000;45000
+  resourceAmounts = 45000;45000;45000;45000;45000;4050,4950;9000;45000;45000;45000
   initialResourceAmounts = 0;0;0;0;0;0,0;0;0;0;0
   tankCost = 31500;36;13500;36000;14400;4131;4500090;630000;720000;360000
 basePartMass = 0.75

diff --git a/GameData/UmbraSpaceIndustries/FTT/Parts/FTT_Kontainer_02.cfg b/GameData/UmbraSpaceIndustries/FTT/Parts/FTT_Kontainer_02.cfg
@@ -66,7 +66,7 @@ MODULE
 {
   name = FSfuelSwitch
   resourceNames = MetallicOre;Water;Substrate;Minerals;Karbonite;LiquidFuel,Oxidizer;RocketParts;Metals;Chemicals;Polymers
-  resourceAmounts =        67500;67500;67500;67500;67500;6075,7425;67500;67500;67500;67500
+  resourceAmounts =        67500;67500;67500;67500;67500;6075,7425;13500;67500;67500;67500
   initialResourceAmounts = 0;0;0;0;0;0,0;0;0;0;0
   tankCost = 47250;54;20250;54000;21600;6200;67500;945000;1080000;540000
   basePartMass = 0.75

diff --git a/GameData/UmbraSpaceIndustries/FTT/Parts/FTT_Kontainer_03.cfg b/GameData/UmbraSpaceIndustries/FTT/Parts/FTT_Kontainer_03.cfg
@@ -77,7 +77,7 @@ MODULE
 {
   name = FSfuelSwitch
   resourceNames = MetallicOre;Water;Substrate;Minerals;Karbonite;LiquidFuel,Oxidizer;RocketParts;Metals;Chemicals;Polymers
-  resourceAmounts = 135000;135000;135000;135000;135000;12150,14850;135000;135000;135000;135000
+  resourceAmounts = 135000;135000;135000;135000;135000;12150,14850;27000;135000;135000;135000
   initialResourceAmounts = 0;0;0;0;0;0,0;0;0;0;0
   tankCost = 94500;108;40500;108000;43200;12393;135000;1890000;2160000;1080000
   basePartMass = 3.35