Merge pull request #123 from BobPalmer/DEVELOP

Develop

FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt

@@ -1,6 +1,17 @@
+0.5.5 - 2016.01.18
+------------------
+Inflatable fuel tank module
+Tweaks to the pulse engine module
+Bundled USI FX as part of USITools, as it is the best common denominator
+
+0.5.4 - 2015.12.08
+------------------
+New modules for aquatic stuff (Ballast, RCS, SAS, engines, and Intake)
+
 0.5.3 - 2015.11.09
 ------------------
 KSP 1.0.5 Compatibility
+New categories for rovers and MKS-Lite
 
 0.5.2 - 2015.10.16
 ------------------

FOR_RELEASE/GameData/000_USITools/Logistics.cfg

@@ -0,0 +1,7 @@
+LOGISTICS_SETTINGS
+{
+	ScavangeRange = 150
+	LogisticsTime = 5
+	WarehouseTime = 10
+	MaintenanceRange = 150
+}

FOR_RELEASE/GameData/000_USITools/USITools.version

@@ -1,6 +1,6 @@
 {
      "NAME":"USI Tools",
-	 "URL":"https://raw.githubusercontent.com/BobPalmer/UmbraSpaceIndustries/master/GameData/UmbraSpaceIndustries/USICore.version",
+	 "URL":"https://raw.githubusercontent.com/BobPalmer/UmbraSpaceIndustries/master/FOR_RELEASE/GameData/UmbraSpaceIndustries/USICore.version",
 	 "DOWNLOAD":"https://github.com/BobPalmer/UmbraSpaceIndustries/releases",
      "GITHUB":{
          "USERNAME":"BobPalmer",
@@ -10,7 +10,7 @@
      "VERSION":{
          "MAJOR":0,
          "MINOR":5,
-         "PATCH":3,
+         "PATCH":5,
          "BUILD":0
      },
      "KSP_VERSION":{

FOR_RELEASE/GameData/CommunityResourcePack/Asteroid.cfg

@@ -80,5 +80,14 @@
 		lowRange = 1
 		highRange = 10
 	}
+
+	MODULE
+	{
+		name = ModuleAsteroidResource
+		highRange = 95
+		lowRange = 80
+		presenceChance = 100
+		resourceName = Rock
+	}		
 
 }

FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt

@@ -1,3 +1,10 @@
+0.4.8 - 2015.12.08
+------------------
+Added 'IntakeLqd' - an oceanic resource to help with oceanic-only parts.
+Modified Asteroid config to include 'Rock'
+Added 'Lead' as a resource (same stats as LeadBallast, but visible/tweakable)
+Adjusted density of 'Rock' to be more like rock, and less like cotton balls
+
 0.4.7 - 2015.11.14
 ------------------
 Merged MKS and MKS-L resources into CRP

FOR_RELEASE/GameData/CommunityResourcePack/CRP.version

@@ -1,6 +1,6 @@
 {
      "NAME":"Community Resource Pack",
-     "URL":"https://raw.githubusercontent.com/BobPalmer/CommunityResourcePack/master/GameData/CommunityResourcePack/CRP.version",
+     "URL":"https://raw.githubusercontent.com/BobPalmer/CommunityResourcePack/master/FOR_RELEASE/GameData/CommunityResourcePack/CRP.version",
      "DOWNLOAD":"https://github.com/BobPalmer/CommunityResourcePack/releases",
      "GITHUB":{
          "USERNAME":"BobPalmer",
@@ -10,7 +10,7 @@
      "VERSION":{
          "MAJOR":0,
          "MINOR":4,
-         "PATCH":7,
+         "PATCH":8,
          "BUILD":0
      },
      "KSP_VERSION":{

FOR_RELEASE/GameData/CommunityResourcePack/CommonResources.cfg

@@ -6,6 +6,32 @@
 //* SECTION 1 CRP/USI Curated
 //******************************
 
+RESOURCE_DEFINITION
+{
+	name = IntakeLqd	//Like IntakeAtm but for oceans
+	density = 0.0010000000
+	hsp = 4183 // specific heat capacity (kJ/tonne-K as units)
+	flowMode = ALL_VESSEL
+	transfer = PUMP
+	isTweakable = true
+    isVisible = true
+	unitCost = 0.0008
+	color = .5,.5,1
+}
+
+RESOURCE_DEFINITION
+{
+    name = Lead
+    density = 0.01134
+    unitCost = 0.067392
+    hsp = 128 
+    flowMode = ALL_VESSEL
+    transfer = PUMP
+    isTweakable = True
+    isVisible = true
+}
+
+
 RESOURCE_DEFINITION
 {
 	name = CarbonDioxide
@@ -287,14 +313,16 @@ RESOURCE_DEFINITION
 RESOURCE_DEFINITION
 {
    name = Rock
-   density = 0.00005
+   density = 0.0025
    flowMode = ALL_VESSEL
    transfer = PUMP
    isTweakable = true
    isVisible = true
    cost = 0.00001
 }
 
+
+
 RESOURCE_DEFINITION
 {
     name = RocketParts

FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/IntakeLqd.cfg

@@ -0,0 +1,27 @@
+//
+//	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!
+//
+
+GLOBAL_RESOURCE
+{
+	ResourceName = IntakeLqd
+	ResourceType = 1
+
+	Distribution
+	{
+		PresenceChance = 100
+		MinAbundance = 100
+		MaxAbundance = 100
+		Variance = 20
+		Dispersal = 3
+	}
+}

FOR_RELEASE/GameData/UmbraSpaceIndustries/CHANGELOG.txt

@@ -1,3 +1,12 @@
+0.1.3 - 2016.01.18
+------------------
+Fixed issue with kontainer texture switching
+Bundled USITools (for nuclear refueling) and shared FX
+Fixed several cost discrepancies (thanks fat-lobyte!) 
+Deprecated Organics
+Replaced RocketParts with MaterialKits - NOTE:  Texture has NOT been redone yet!
+USI Core is bundled with an Extraplanetary Launchpads config that replaces RocketParts with MaterialKits and SpecializedParts.  This is provided for compatibility with the USI mod constellation.
+
 0.1.2 - 2015.11.14
 ------------------
 Put trickle charge back in for reactors

FOR_RELEASE/GameData/UmbraSpaceIndustries/FTT/CHANGELOG.txt

@@ -1,3 +1,7 @@
+0.4.4 - 2016.01.18
+------------------
+Interim patch to fix some node/cost issues and update dependencies
+
 0.4.3 - 2015.11.16
 ------------------
 Fixed issues with ducted fan engines not working properly

FOR_RELEASE/GameData/UmbraSpaceIndustries/FTT/FTT.version

@@ -1,6 +1,6 @@
 {
      "NAME":"Freight Transport Tech",
-	 "URL":"https://raw.githubusercontent.com/BobPalmer/FTT/master/GameData/UmbraSpaceIndustries/FTT/FTT.version",
+	 "URL":"https://raw.githubusercontent.com/BobPalmer/FTT/master/FOR_RELEASE/GameData/UmbraSpaceIndustries/FTT/FTT.version",
 	 "DOWNLOAD":"https://github.com/BobPalmer/FTT/releases",
      "GITHUB":{
          "USERNAME":"BobPalmer",
@@ -10,7 +10,7 @@
      "VERSION":{
          "MAJOR":0,
          "MINOR":4,
-         "PATCH":3,
+         "PATCH":4,
          "BUILD":0
      },
      "KSP_VERSION":{

FOR_RELEASE/GameData/UmbraSpaceIndustries/FTT/Parts/FTT_Cargo_375_01.cfg

@@ -48,7 +48,7 @@ MODULE
   moduleID = 0
   textureNames = UmbraSpaceIndustries/FTT/Assets/DECAL;UmbraSpaceIndustries/FTT/Assets/DECAL;UmbraSpaceIndustries/FTT/Assets/DECAL;UmbraSpaceIndustries/FTT/Assets/DECAL;UmbraSpaceIndustries/FTT/Assets/DECAL;UmbraSpaceIndustries/FTT/Assets/DECAL;UmbraSpaceIndustries/FTT/Assets/DECAL;UmbraSpaceIndustries/FTT/Assets/DECAL;UmbraSpaceIndustries/FTT/Assets/DECAL
   objectNames =
-  textureDisplayNames = MetallicOre;Water;Substrate;Minerals;Karbonite;LFO;MonoPropellant;Uraninite;RocketParts
+  textureDisplayNames = MetallicOre;Water;Substrate;Minerals;Karbonite;LFO;MonoPropellant;Uraninite;MaterialKits
   useFuelSwitchModule = true
   fuelTankSetups = 0;1;2;3;4;5;6;7;8
   repaintableEVA = false
@@ -59,8 +59,8 @@ MODULE
 MODULE
 {
   name = FSfuelSwitch
-  resourceNames = MetallicOre;Water;Substrate;Minerals;Karbonite;LiquidFuel,Oxidizer;MonoPropellant;Uraninite;RocketParts
-  resourceAmounts =        15000;15000;15000;15000;15000;1350,1650;15000;15000;3000
+  resourceNames = MetallicOre;Water;Substrate;Minerals;Karbonite;LiquidFuel,Oxidizer;MonoPropellant;Uraninite;MaterialKits
+  resourceAmounts =        15000;15000;15000;15000;15000;1350,1650;15000;15000;15000
   initialResourceAmounts = 0;0;0;0;0;0,0;0;0;0
   tankCost = 10500;12;4500;12000;4800;1377;3600;10500;15000
 	basePartMass = 0.5

FOR_RELEASE/GameData/UmbraSpaceIndustries/FTT/Parts/FTT_Cargo_375_02.cfg

@@ -59,7 +59,7 @@ MODULE
   moduleID = 0
   textureNames = UmbraSpaceIndustries/FTT/Assets/DECAL;UmbraSpaceIndustries/FTT/Assets/DECAL;UmbraSpaceIndustries/FTT/Assets/DECAL;UmbraSpaceIndustries/FTT/Assets/DECAL;UmbraSpaceIndustries/FTT/Assets/DECAL;UmbraSpaceIndustries/FTT/Assets/DECAL;UmbraSpaceIndustries/FTT/Assets/DECAL;UmbraSpaceIndustries/FTT/Assets/DECAL;UmbraSpaceIndustries/FTT/Assets/DECAL
   objectNames =
-  textureDisplayNames = MetallicOre;Water;Substrate;Minerals;Karbonite;LFO;MonoPropellant;Uraninite;RocketParts
+  textureDisplayNames = MetallicOre;Water;Substrate;Minerals;Karbonite;LFO;MonoPropellant;Uraninite;MaterialKits
   useFuelSwitchModule = true
   fuelTankSetups = 0;1;2;3;4;5;6;7;8
   repaintableEVA = false
@@ -70,8 +70,8 @@ MODULE
 MODULE
 {
   name = FSfuelSwitch
-  resourceNames = MetallicOre;Water;Substrate;Minerals;Karbonite;LiquidFuel,Oxidizer;MonoPropellant;Uraninite;RocketParts
-  resourceAmounts = 45000;45000;45000;45000;45000;4050,4950;45000;45000;9000
+  resourceNames = MetallicOre;Water;Substrate;Minerals;Karbonite;LiquidFuel,Oxidizer;MonoPropellant;Uraninite;MaterialKits
+  resourceAmounts = 45000;45000;45000;45000;45000;4050,4950;45000;45000;45000
   initialResourceAmounts = 0;0;0;0;0;0,0;0;0;0
   tankCost = 31500;36;13500;36000;14400;4131;10800;31500;45000
   basePartMass = 1.5

FOR_RELEASE/GameData/UmbraSpaceIndustries/FTT/Parts/FTT_Kontainer_01.cfg

@@ -53,7 +53,7 @@ MODULE
   name = FStextureSwitch2
   textureNames = UmbraSpaceIndustries/FTT/Assets/Kontainer_00;UmbraSpaceIndustries/FTT/Assets/Kontainer_05;UmbraSpaceIndustries/FTT/Assets/Kontainer_02;UmbraSpaceIndustries/FTT/Assets/Kontainer_03;UmbraSpaceIndustries/FTT/Assets/Kontainer_04;UmbraSpaceIndustries/FTT/Assets/Kontainer_01;UmbraSpaceIndustries/FTT/Assets/Kontainer_06;UmbraSpaceIndustries/FTT/Assets/Kontainer_07;UmbraSpaceIndustries/FTT/Assets/Kontainer_08;UmbraSpaceIndustries/FTT/Assets/Kontainer_09
   objectNames = FreightKan
-  textureDisplayNames = MetallicOre;Water;Substrate;Minerals;Karbonite;LFO;RocketParts;Metals;Chemicals;Polymers
+  textureDisplayNames = MetallicOre;Water;Substrate;Minerals;Karbonite;LFO;MaterialKits;Metals;Chemicals;Polymers
   useFuelSwitchModule = true
   fuelTankSetups = 0;1;2;3;4;5;6;7;8;9
   repaintableEVA = false
@@ -63,8 +63,8 @@ MODULE
 MODULE
 {
   name = FSfuelSwitch
-  resourceNames = MetallicOre;Water;Substrate;Minerals;Karbonite;LiquidFuel,Oxidizer;RocketParts;Metals;Chemicals;Polymers
-  resourceAmounts = 45000;45000;45000;45000;45000;4050,4950;9000;45000;45000;45000
+  resourceNames = MetallicOre;Water;Substrate;Minerals;Karbonite;LiquidFuel,Oxidizer;MaterialKits;Metals;Chemicals;Polymers
+  resourceAmounts = 45000;45000;45000;45000;45000;4050,4950;45000;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

FOR_RELEASE/GameData/UmbraSpaceIndustries/FTT/Parts/FTT_Kontainer_02.cfg

@@ -55,7 +55,7 @@ MODULE
   name = FStextureSwitch2
   textureNames = UmbraSpaceIndustries/FTT/Assets/Kontainer_00;UmbraSpaceIndustries/FTT/Assets/Kontainer_05;UmbraSpaceIndustries/FTT/Assets/Kontainer_02;UmbraSpaceIndustries/FTT/Assets/Kontainer_03;UmbraSpaceIndustries/FTT/Assets/Kontainer_04;UmbraSpaceIndustries/FTT/Assets/Kontainer_01;UmbraSpaceIndustries/FTT/Assets/Kontainer_06;UmbraSpaceIndustries/FTT/Assets/Kontainer_07;UmbraSpaceIndustries/FTT/Assets/Kontainer_08;UmbraSpaceIndustries/FTT/Assets/Kontainer_09
   objectNames = Kontainer_2
-  textureDisplayNames = MetallicOre;Water;Substrate;Minerals;Karbonite;LFO;RocketParts;Metals;Chemicals;Polymers
+  textureDisplayNames = MetallicOre;Water;Substrate;Minerals;Karbonite;LFO;MaterialKits;Metals;Chemicals;Polymers
   useFuelSwitchModule = true
   fuelTankSetups = 0;1;2;3;4;5;6;7;8;9
     repaintableEVA = false
@@ -65,8 +65,8 @@ MODULE
 MODULE
 {
   name = FSfuelSwitch
-  resourceNames = MetallicOre;Water;Substrate;Minerals;Karbonite;LiquidFuel,Oxidizer;RocketParts;Metals;Chemicals;Polymers
-  resourceAmounts =        67500;67500;67500;67500;67500;6075,7425;13500;67500;67500;67500
+  resourceNames = MetallicOre;Water;Substrate;Minerals;Karbonite;LiquidFuel,Oxidizer;MaterialKits;Metals;Chemicals;Polymers
+  resourceAmounts =        67500;67500;67500;67500;67500;6075,7425;67500;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

FOR_RELEASE/GameData/UmbraSpaceIndustries/FTT/Parts/FTT_Kontainer_03.cfg

@@ -66,7 +66,7 @@ MODULE
   name = FStextureSwitch2
   textureNames = UmbraSpaceIndustries/FTT/Assets/Kontainer_00;UmbraSpaceIndustries/FTT/Assets/Kontainer_05;UmbraSpaceIndustries/FTT/Assets/Kontainer_02;UmbraSpaceIndustries/FTT/Assets/Kontainer_03;UmbraSpaceIndustries/FTT/Assets/Kontainer_04;UmbraSpaceIndustries/FTT/Assets/Kontainer_01;UmbraSpaceIndustries/FTT/Assets/Kontainer_06;UmbraSpaceIndustries/FTT/Assets/Kontainer_07;UmbraSpaceIndustries/FTT/Assets/Kontainer_08;UmbraSpaceIndustries/FTT/Assets/Kontainer_09
   objectNames = Kontainer_2
-  textureDisplayNames = MetallicOre;Water;Substrate;Minerals;Karbonite;LFO;RocketParts;Metals;Chemicals;Polymers
+  textureDisplayNames = MetallicOre;Water;Substrate;Minerals;Karbonite;LFO;MaterialKits;Metals;Chemicals;Polymers
   useFuelSwitchModule = true
   fuelTankSetups = 0;1;2;3;4;5;6;7;8;9
   repaintableEVA = false
@@ -76,8 +76,8 @@ MODULE
 MODULE
 {
   name = FSfuelSwitch
-  resourceNames = MetallicOre;Water;Substrate;Minerals;Karbonite;LiquidFuel,Oxidizer;RocketParts;Metals;Chemicals;Polymers
-  resourceAmounts = 135000;135000;135000;135000;135000;12150,14850;27000;135000;135000;135000
+  resourceNames = MetallicOre;Water;Substrate;Minerals;Karbonite;LiquidFuel,Oxidizer;MaterialKits;Metals;Chemicals;Polymers
+  resourceAmounts = 135000;135000;135000;135000;135000;12150,14850;135000;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

FOR_RELEASE/GameData/UmbraSpaceIndustries/FTT/Parts/FTT_Structural_500_05.cfg

@@ -29,15 +29,15 @@ MODEL
 // definition format is Position X, Position Y, Position Z, Up X, Up Y, Up Z
 
 node_stack_cargo_01 = .8, 0, 0, 1, 0, 0.0, 3
-node_stack_cargo_02 = -.8, 0, 0, 1, 0, 0.0, 3
+node_stack_cargo_02 = -.8, 0, 0, -1, 0, 0.0, 3
 node_stack_cargo_03 = .8, 7.5, 0, 1, 0, 0.0, 3
-node_stack_cargo_04 = -.8, 7.5, 0, 1, 0, 0.0, 3
+node_stack_cargo_04 = -.8, 7.5, 0, -1, 0, 0.0, 3
 node_stack_cargo_05 = .8, -7.5, 0, 1, 0, 0.0, 3
-node_stack_cargo_06 = -.8, -7.5, 0, 1, 0, 0.0, 3
+node_stack_cargo_06 = -.8, -7.5, 0, -1, 0, 0.0, 3
 
 
-node_stack_bottom_R = 0, -11.25, 0, 0.0, 1.0, 0.0, 3
-node_stack_top_L = 0, 11.25, 0, 0.0, -1.0, 0.0, 3
+node_stack_bottom_R = 0, -11.25, 0, 0.0, -1.0, 0.0, 3
+node_stack_top_L = 0, 11.25, 0, 0.0, 1.0, 0.0, 3
 
 
 breakingForce = 203040
@@ -65,6 +65,7 @@ minimum_drag = 0.15
 angularDrag = 2
 crashTolerance = 45
 maxTemp = 3400
+bulkheadProfiles = size4
 
 
 

FOR_RELEASE/GameData/UmbraSpaceIndustries/FTT/Parts/FTT_Tank_1000_01.cfg

@@ -26,8 +26,8 @@ breakingTorque = 203040
 
 // --- editor parameters ---
 TechRequired = veryHeavyRocketry
-entryCost = 500000
-cost = 250000
+entryCost = 400000
+cost = 43110
 category = Propulsion
 subcategory = 0
 title = Jumbo Spherical Liquid Hydrogen Tank
@@ -38,13 +38,14 @@ description = Useful for carrying large amounts of liquid hydrogen, generally us
 attachRules = 1,0,1,1,0
 
 // --- standard part parameters ---
-mass = 30
+mass = 9.8
 dragModelType = default
 maximum_drag = 0.20
 minimum_drag = 0.15
 angularDrag = 2
 crashTolerance = 45
 maxTemp = 3400
+bulkheadProfiles = size4
 
 
 

FOR_RELEASE/GameData/UmbraSpaceIndustries/FTT/Parts/FTT_Tank_500_01.cfg

@@ -38,13 +38,14 @@ description = Useful for carrying large amounts of liquid hydrogen, generally us
 attachRules = 1,0,1,1,0
 
 // --- standard part parameters ---
-mass = 6
+mass = 1.5
 dragModelType = default
 maximum_drag = 0.20
 minimum_drag = 0.15
 angularDrag = 2
 crashTolerance = 45
 maxTemp = 3400
+bulkheadProfiles = size4
 
 
 

FOR_RELEASE/GameData/UmbraSpaceIndustries/FTT/Parts/FTT_Tank_500_02.cfg

@@ -51,13 +51,14 @@ description = Useful for carrying large amounts of liquid hydrogen, generally us
 attachRules = 1,1,1,1,0
 
 // --- standard part parameters ---
-mass = 18
+mass = 4.5
 dragModelType = default
 maximum_drag = 0.20
 minimum_drag = 0.15
 angularDrag = 2
 crashTolerance = 45
 maxTemp = 3400
+bulkheadProfiles = size4, srf