Merge pull request #26 from BobPalmer/DEVELOP

Develop
UmbraSpaceIndustries · Apr 17, 2016 · b7f5931 · b7f5931
2 parents 058c8e3 + 4f96613
commit b7f5931
Show file tree

Hide file tree

Showing 21 changed files with 82 additions and 62 deletions.
diff --git a/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt b/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt
@@ -1,3 +1,7 @@
+0.7.1 - 2016.4.16
+-----------------
+Compatibility fixes for KSP 1.1
+
 0.7.0 - 2016.03.29
 ------------------
 Compatibility with KSP 1.1

diff --git a/FOR_RELEASE/GameData/000_USITools/Flags/CatFlag.png b/FOR_RELEASE/GameData/000_USITools/Flags/CatFlag.png
diff --git a/FOR_RELEASE/GameData/000_USITools/USITools.dll b/FOR_RELEASE/GameData/000_USITools/USITools.dll
diff --git a/FOR_RELEASE/GameData/000_USITools/USITools.version b/FOR_RELEASE/GameData/000_USITools/USITools.version
@@ -10,7 +10,7 @@
      "VERSION":{
          "MAJOR":0,
          "MINOR":7,
-         "PATCH":0,
+         "PATCH":1,
          "BUILD":0
      },
      "KSP_VERSION":{

diff --git a/FOR_RELEASE/GameData/Firespitter/Firespitter.version b/FOR_RELEASE/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": 1,
-"PATCH": 5
+    "MINOR": 2,
+	"PATCH": 1
   },
   "KSP_VERSION": {
     "MAJOR": 1,
-    "MINOR": 0,
-    "PATCH": 5
+    "MINOR": 1,
+    "PATCH": 0
   }
 }
diff --git a/FOR_RELEASE/GameData/Firespitter/Plugins/Firespitter.dll b/FOR_RELEASE/GameData/Firespitter/Plugins/Firespitter.dll
diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/CHANGELOG.txt b/FOR_RELEASE/GameData/UmbraSpaceIndustries/CHANGELOG.txt
@@ -1,3 +1,7 @@
+0.2.1 - 2016.04.16
+------------------
+Improved CryoTanks Compatibility (Thanks LouisB3!)
+
 0.2.0 - 2016.03.29
 -----------
 Compatibility with KSP 1.1

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/CryoTanks.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/CryoTanks.cfg
@@ -0,0 +1,12 @@
+@PART[C3_Tank_*,C3_RTank_*,RadialLqdTank]:NEEDS[SimpleBoiloff]
+{
+    MODULE
+    {
+      name =  ModuleCryoTank
+  		FuelName = LqdHydrogen
+  		// in % per hour
+  		BoiloffRate = 0.05
+  		// in Ec per 1000 units per second
+  		CoolingCost = 0.08
+    }
+}
diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RadialLqdTank.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RadialLqdTank.cfg
@@ -7,7 +7,7 @@ PART
 	MODEL
 	{
 		model = UmbraSpaceIndustries/Kontainers/Assets/MKV_SaddleTank
-	}	
+	}
 
 	scale = 1
 	rescaleFactor = 1
@@ -30,7 +30,7 @@ PART
 	minimum_drag = 0.2
 	angularDrag = 1
 	crashTolerance = 15
-	maxTemp = 2000 
+	maxTemp = 2000
 	bulkheadProfiles = size1
 
 	crashTolerance = 10
@@ -53,7 +53,7 @@ PART
         equipable = false
         equipMode = part
         equipSlot = Back Pocket
-        equipSkill = 
+        equipSkill =
         equipRemoveHelmet = false
         equipMeshName = helmet
         equipBoneName = helmet01
@@ -78,7 +78,7 @@ PART
 	{
 		name = FSfuelSwitch
 		resourceNames =LiquidFuel,Oxidizer;Water;Chemicals;Mulch;LqdHydrogen;LiquidFuel;MonoPropellant
-		resourceAmounts = 112.5,137.5;1250;1250;1250;12500;250;250
+		resourceAmounts = 112.5,137.5;1250;1250;1250;5000;250;250
 		initialResourceAmounts = 0;0;0;0;0;0;0
 		tankCost = 114.75;1;20000;3125;45.93750;200;300
 		basePartMass = 0.15625
@@ -93,6 +93,6 @@ PART
 	{
 		name = USI_ModuleRecycleBin
 	}
-	
-	
+
+
 }
diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_00.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_00.cfg
@@ -56,7 +56,7 @@ bulkheadProfiles = size0,srf
 	{
 		name = FSfuelSwitch
 		resourceNames = Karborundum;XenonGas;ArgonGas;LiquidFuel,Oxidizer;Water;Chemicals;Mulch;LqdHydrogen;LiquidFuel;MonoPropellant
-		resourceAmounts = 450;4500;45000;40.5,49.5;450;450;450;4500;90;90
+		resourceAmounts = 450;4500;45000;40.5,49.5;450;450;450;1800;90;90
 		initialResourceAmounts = 0;4500;45000;0;0;0;0;0;0;0
 		tankCost = 180000;18000;472.5;41.31;0.45;7200;562;33.075;72;108
 		basePartMass = 0.05625
@@ -74,7 +74,7 @@ bulkheadProfiles = size0,srf
 		fuelTankSetups = 0;1;2;3;4;5;6;7;8;9
 		repaintableEVA = true
 		nextButtonText = Next Cargo
-		prevButtonText = Previous Cargo	
+		prevButtonText = Previous Cargo
 		moduleID = 2
 		}
 	MODULE
@@ -86,7 +86,7 @@ bulkheadProfiles = size0,srf
 		mapNames = UmbraSpaceIndustries/Kontainers/Assets/CrinkleFoil_NRM; UmbraSpaceIndustries/Kontainers/Assets/CrinkleFoil_NRM; UmbraSpaceIndustries/Kontainers/Assets/CrinkleFoil_NRM;UmbraSpaceIndustries/Kontainers/Assets/cloth_NRM;
 		useFuelSwitchModule = false
 		nextButtonText = Next Texture
-		prevButtonText = Previous Texture		
+		prevButtonText = Previous Texture
 		moduleID = 1
 	}
 

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_01.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_01.cfg
@@ -54,7 +54,7 @@ bulkheadProfiles = size0,srf
 	{
 		name = FSfuelSwitch
 		resourceNames = Karborundum;XenonGas;ArgonGas;LiquidFuel,Oxidizer;Water;Chemicals;Mulch;LqdHydrogen;LiquidFuel;MonoPropellant
-		resourceAmounts = 3500;35000;350000;315,385;3500;3500;3500;35000;700;700
+		resourceAmounts = 3500;35000;350000;315,385;3500;3500;3500;14000;700;700
  		initialResourceAmounts = 0;35000;350000;0;0;0;0;0;0;0
  		tankCost = 1400000;140000;3675;321.3;2.8;56000;8750;1286;560;840
 		basePartMass = 0.4375
@@ -73,7 +73,7 @@ bulkheadProfiles = size0,srf
 		fuelTankSetups = 0;1;2;3;4;5;6;7;8;9
 		repaintableEVA = true
 		nextButtonText = Next Cargo
-		prevButtonText = Previous Cargo		
+		prevButtonText = Previous Cargo
 		moduleID = 2
 	}
 	MODULE
@@ -85,7 +85,7 @@ bulkheadProfiles = size0,srf
 		mapNames = UmbraSpaceIndustries/Kontainers/Assets/CrinkleFoil_NRM; UmbraSpaceIndustries/Kontainers/Assets/CrinkleFoil_NRM; UmbraSpaceIndustries/Kontainers/Assets/CrinkleFoil_NRM;UmbraSpaceIndustries/Kontainers/Assets/cloth_NRM;
 		useFuelSwitchModule = false
 		nextButtonText = Next Texture
-		prevButtonText = Previous Texture		
+		prevButtonText = Previous Texture
 		moduleID = 1
 	}
 

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_02.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_02.cfg
@@ -56,14 +56,14 @@ bulkheadProfiles = size1,srf
 	{
 		name = FSfuelSwitch
 		resourceNames = Karborundum;XenonGas;ArgonGas;LiquidFuel,Oxidizer;Water;Chemicals;Mulch;LqdHydrogen;LiquidFuel;MonoPropellant
-		resourceAmounts = 30000;300000;3000000;2700,3300;30000;30000;30000;300000;6000;6000
+		resourceAmounts = 30000;300000;3000000;2700,3300;30000;30000;30000;120000;6000;6000
 		initialResourceAmounts = 0;300000;3000000;0;0;0;0;0;0;0
 		tankCost = 12000000;1200000;31500;2754;24;480000;75000;11025;4800;7200
 		basePartMass = 3.75
 		tankMass = 0;0;0;0;0;0;0;0;0;0
 		hasGUI = false
 	}
-	
+
 
 	MODULE
 	{
@@ -75,7 +75,7 @@ bulkheadProfiles = size1,srf
 		fuelTankSetups = 0;1;2;3;4;5;6;7;8;9
 		repaintableEVA = true
 		nextButtonText = Next Cargo
-		prevButtonText = Previous Cargo		
+		prevButtonText = Previous Cargo
 		moduleID = 2
 		}
 	MODULE
@@ -87,7 +87,7 @@ bulkheadProfiles = size1,srf
 		mapNames = UmbraSpaceIndustries/Kontainers/Assets/CrinkleFoil_NRM; UmbraSpaceIndustries/Kontainers/Assets/CrinkleFoil_NRM; UmbraSpaceIndustries/Kontainers/Assets/CrinkleFoil_NRM;UmbraSpaceIndustries/Kontainers/Assets/cloth_NRM;
 		useFuelSwitchModule = false
 		nextButtonText = Next Texture
-		prevButtonText = Previous Texture		
+		prevButtonText = Previous Texture
 		moduleID = 1
 	}
 

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_03.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_03.cfg
@@ -56,7 +56,7 @@ bulkheadProfiles = size1p5,srf
 	{
 		name = FSfuelSwitch
 		resourceNames = Karborundum;XenonGas;ArgonGas;LiquidFuel,Oxidizer;Water;Chemicals;Mulch;LqdHydrogen;LiquidFuel;MonoPropellant
-		resourceAmounts = 100000;1000000;10000000;9000,11000;100000;100000;100000;1000000;20000;20000
+		resourceAmounts = 100000;1000000;10000000;9000,11000;100000;100000;100000;400000;20000;20000
 		initialResourceAmounts = 0;1000000;10000000;0;0;0;0;0;0;0
 		tankCost = 4000000;4000000;105000;9180;80;1600000;250000;36750;16000;24000
 		basePartMass = 12.5
@@ -74,7 +74,7 @@ bulkheadProfiles = size1p5,srf
 		fuelTankSetups = 0;1;2;3;4;5;6;7;8;9
 		repaintableEVA = true
 		nextButtonText = Next Cargo
-		prevButtonText = Previous Cargo		
+		prevButtonText = Previous Cargo
 		moduleID = 2
 		}
 	MODULE
@@ -86,9 +86,9 @@ bulkheadProfiles = size1p5,srf
 		mapNames = UmbraSpaceIndustries/Kontainers/Assets/CrinkleFoil_NRM; UmbraSpaceIndustries/Kontainers/Assets/CrinkleFoil_NRM; UmbraSpaceIndustries/Kontainers/Assets/CrinkleFoil_NRM;UmbraSpaceIndustries/Kontainers/Assets/cloth_NRM;
 		useFuelSwitchModule = false
 		nextButtonText = Next Texture
-		prevButtonText = Previous Texture		
+		prevButtonText = Previous Texture
 		moduleID = 1
-	}	
+	}
 
 
 	MODULE

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_04.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_04.cfg
@@ -56,7 +56,7 @@ bulkheadProfiles = size2,srf
 	{
 		name = FSfuelSwitch
 		resourceNames = Karborundum;XenonGas;ArgonGas;LiquidFuel,Oxidizer;Water;Chemicals;Mulch;LqdHydrogen;LiquidFuel;MonoPropellant
-		resourceAmounts = 230000;2300000;23000000;20700,25300;230000;230000;230000;2300000;46000;46000
+		resourceAmounts = 230000;2300000;23000000;20700,25300;230000;230000;230000;920000;46000;46000
 		initialResourceAmounts = 0;2300000;23000000;0;0;0;0;0;0;0
 		tankCost = 9200000;9200000;241500;21114;184;3680000;575000;84525;36800;55200
 		basePartMass = 28.75
@@ -74,7 +74,7 @@ bulkheadProfiles = size2,srf
 		fuelTankSetups = 0;1;2;3;4;5;6;7;8;9
 		repaintableEVA = true
 		nextButtonText = Next Cargo
-		prevButtonText = Previous Cargo		
+		prevButtonText = Previous Cargo
 		moduleID = 2
 		}
 	MODULE
@@ -86,7 +86,7 @@ bulkheadProfiles = size2,srf
 		mapNames = UmbraSpaceIndustries/Kontainers/Assets/CrinkleFoil_NRM; UmbraSpaceIndustries/Kontainers/Assets/CrinkleFoil_NRM; UmbraSpaceIndustries/Kontainers/Assets/CrinkleFoil_NRM;UmbraSpaceIndustries/Kontainers/Assets/cloth_NRM;
 		useFuelSwitchModule = false
 		nextButtonText = Next Texture
-		prevButtonText = Previous Texture		
+		prevButtonText = Previous Texture
 		moduleID = 1
 	}
 

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_06.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_06.cfg
@@ -56,7 +56,7 @@ bulkheadProfiles = size3,srf
 	{
 		name = FSfuelSwitch
 		resourceNames = Karborundum;XenonGas;ArgonGas;LiquidFuel,Oxidizer;Water;Chemicals;Mulch;LqdHydrogen;LiquidFuel;MonoPropellant
-		resourceAmounts = 750000;7500000;75000000;67500,82500;750000;750000;750000;7500000;150000;150000
+		resourceAmounts = 750000;7500000;75000000;67500,82500;750000;750000;750000;3000000;150000;150000
 		initialResourceAmounts = 0;7500000;75000000;0;0;0;0;0;0;0
 		tankCost = 30000000;30000000;787500;68850;600;12000000;1875000;275625;121280;180000
 		basePartMass = 93.75
@@ -74,7 +74,7 @@ bulkheadProfiles = size3,srf
 		fuelTankSetups = 0;1;2;3;4;5;6;7;8;9
 		repaintableEVA = true
 		nextButtonText = Next Cargo
-		prevButtonText = Previous Cargo	
+		prevButtonText = Previous Cargo
 		moduleID = 2
 	}
 
@@ -87,11 +87,11 @@ bulkheadProfiles = size3,srf
 		mapNames = UmbraSpaceIndustries/Kontainers/Assets/CrinkleFoil_NRM; UmbraSpaceIndustries/Kontainers/Assets/CrinkleFoil_NRM; UmbraSpaceIndustries/Kontainers/Assets/CrinkleFoil_NRM;UmbraSpaceIndustries/Kontainers/Assets/cloth_NRM;
 		useFuelSwitchModule = false
 		nextButtonText = Next Texture
-		prevButtonText = Previous Texture		
+		prevButtonText = Previous Texture
 		moduleID = 1
-	}	
+	}
+
 
-
 	MODULE
 	{
 		name = USI_ModuleResourceWarehouse

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_08.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_08.cfg
@@ -56,7 +56,7 @@ bulkheadProfiles = size4,srf
 	{
 		name = FSfuelSwitch
 		resourceNames = Karborundum;XenonGas;ArgonGas;LiquidFuel,Oxidizer;Water;Chemicals;Mulch;LqdHydrogen;LiquidFuel;MonoPropellant
-		resourceAmounts = 1800000;18000000;180000000;162000,198000;1800000;1800000;1800000;18000000;360000;360000
+		resourceAmounts = 1800000;18000000;180000000;162000,198000;1800000;1800000;1800000;7200000;360000;360000
 		initialResourceAmounts = 0;18000000;180000000;0;0;0;0;0;0;0
 		tankCost = 72000000;72000000;1890000;165240;1440;28800000;4500000;661500;288000;432000
 		basePartMass = 225
@@ -74,7 +74,7 @@ bulkheadProfiles = size4,srf
 		fuelTankSetups = 0;1;2;3;4;5;6;7;8;9
 		repaintableEVA = true
 		nextButtonText = Next Cargo
-		prevButtonText = Previous Cargo		
+		prevButtonText = Previous Cargo
 		moduleID = 2
 	}
 
@@ -87,10 +87,10 @@ bulkheadProfiles = size4,srf
 		mapNames = UmbraSpaceIndustries/Kontainers/Assets/CrinkleFoil_NRM; UmbraSpaceIndustries/Kontainers/Assets/CrinkleFoil_NRM; UmbraSpaceIndustries/Kontainers/Assets/CrinkleFoil_NRM;UmbraSpaceIndustries/Kontainers/Assets/cloth_NRM;
 		useFuelSwitchModule = false
 		nextButtonText = Next Texture
-		prevButtonText = Previous Texture		
+		prevButtonText = Previous Texture
 		moduleID = 1
-	}	
-	
+	}
+
 
 
 	MODULE

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Tank_01.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Tank_01.cfg
@@ -54,7 +54,7 @@ bulkheadProfiles = size1,srf
 	{
 		name = FSfuelSwitch
 		resourceNames =Karborundum;XenonGas;ArgonGas;LiquidFuel,Oxidizer;Water;Chemicals;Mulch;LqdHydrogen;LiquidFuel;MonoPropellant
-		resourceAmounts = 2500;25000;250000;225,275;2500;2500;2500;25000;500;500
+		resourceAmounts = 2500;25000;250000;225,275;2500;2500;2500;10000;500;500
 		initialResourceAmounts = 0;0;0;0;0;0;0;0;0;0
 		tankCost = 1000000;100000;2625;229.5;2;40000;62500;91.875;400;600
 		basePartMass = 0.3125
@@ -72,7 +72,7 @@ bulkheadProfiles = size1,srf
 		fuelTankSetups = 0;1;2;3;4;5;6;7;8;9
 		repaintableEVA = true
 		nextButtonText = Next Cargo
-		prevButtonText = Previous Cargo	
+		prevButtonText = Previous Cargo
 		moduleID = 2
 	}
 
@@ -85,10 +85,10 @@ bulkheadProfiles = size1,srf
 		mapNames = UmbraSpaceIndustries/Kontainers/Assets/CrinkleFoil_NRM; UmbraSpaceIndustries/Kontainers/Assets/CrinkleFoil_NRM; UmbraSpaceIndustries/Kontainers/Assets/CrinkleFoil_NRM;UmbraSpaceIndustries/Kontainers/Assets/cloth_NRM;
 		useFuelSwitchModule = false
 		nextButtonText = Next Texture
-		prevButtonText = Previous Texture		
+		prevButtonText = Previous Texture
 		moduleID = 1
-	}	
-	
+	}
+
 
 
 	MODULE

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Tank_02.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Tank_02.cfg
@@ -55,7 +55,7 @@ bulkheadProfiles = size2,srf
 	{
 		name = FSfuelSwitch
 		resourceNames =Karborundum;XenonGas;ArgonGas;LiquidFuel,Oxidizer;Water;Chemicals;Mulch;LqdHydrogen;LiquidFuel;MonoPropellant
-		resourceAmounts = 20000;200000;2000000;1800,2200;20000;20000;20000;200000;4000;4000
+		resourceAmounts = 20000;200000;2000000;1800,2200;20000;20000;20000;80000;4000;4000
 		initialResourceAmounts = 0;0;0;0;0;0;0;0;0;0
 		tankCost = 8000000;800000;21000;1836;16;320000;500000;735;3200;4800
 		basePartMass = 2.5
@@ -73,7 +73,7 @@ bulkheadProfiles = size2,srf
 		fuelTankSetups = 0;1;2;3;4;5;6;7;8;9
 		repaintableEVA = true
 		nextButtonText = Next Cargo
-		prevButtonText = Previous Cargo	
+		prevButtonText = Previous Cargo
 		moduleID = 2
 	}
 
@@ -86,10 +86,10 @@ bulkheadProfiles = size2,srf
 		mapNames = UmbraSpaceIndustries/Kontainers/Assets/CrinkleFoil_NRM; UmbraSpaceIndustries/Kontainers/Assets/CrinkleFoil_NRM; UmbraSpaceIndustries/Kontainers/Assets/CrinkleFoil_NRM;UmbraSpaceIndustries/Kontainers/Assets/cloth_NRM;
 		useFuelSwitchModule = false
 		nextButtonText = Next Texture
-		prevButtonText = Previous Texture		
+		prevButtonText = Previous Texture
 		moduleID = 1
-	}	
-	
+	}
+
 
 
 	MODULE