Merge pull request #1 from BobPalmer/DEVELOP

Develop

FOR_RELEASE/GameData/Firespitter/Firespitter.version

@@ -0,0 +1,14 @@
+{
+  "NAME": "Firespitter",
+  "URL": "https://raw.githubusercontent.com/snjo/Firespitter/master/For%20release/Firespitter/Firespitter.version",
+  "VERSION": {
+    "MAJOR": 7,
+    "MINOR": 1,
+"PATCH": 4
+  },
+  "KSP_VERSION": {
+    "MAJOR": 1,
+    "MINOR": 0,
+    "PATCH": 4
+  }
+}

FOR_RELEASE/GameData/Firespitter/Plugins/FSfuelSwitchTweakscale.cfg

@@ -0,0 +1,14 @@
+@TWEAKSCALEEXPONENTS[FSfuelSwitch]:NEEDS[TweakScale]
+{
+	@tankList
+	{
+		@resources
+		{
+			@amount = 3
+			@maxAmount = 3
+		}
+	}
+	%basePartMass = 3
+	weightList = 3
+	tankCostList = 3
+}

FOR_RELEASE/GameData/UmbraSpaceIndustries/CHANGELOG.txt

@@ -0,0 +1,8 @@
+0.1.0 - 2015.10.16
+------------------
+Broke USI_Core out from the USITools DLL
+Moved nuclear reactors to Advanced Science Tech in the stock tech tree, and Nuclear Power/ Large Nuclear Power in CTT
+Bundled container CTT configs from MKS
+Moved KIS kontainers into appropriate CTT nodes
+Swapped DepletedUranium for DepletedFuel in reactors and containers
+

FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/CTT.cfg

@@ -0,0 +1,91 @@
+
+@PART[C3_RTank_00]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = storageTech
+
+}
+@PART[C3_RTank_01]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = storageTech
+
+}
+@PART[C3_RTank_02]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = logistics
+}
+@PART[C3_RTank_03]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = advLogistics
+}
+@PART[C3_RTank_04]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = advLogistics
+}
+@PART[C3_RTank_06]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = advLogistics
+}
+@PART[C3_RTank_08]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = advLogistics
+}
+
+@PART[C3_Tank_01]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = storageTech
+}
+@PART[C3_Tank_02]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = logistics
+}
+@PART[C3_Tank_03]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = advLogistics
+}
+@PART[C3_Tank_04]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = advLogistics
+}
+
+
+@PART[C3_Kontainer_01]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = storageTech
+}
+@PART[C3_Kontainer_02]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = logistics
+}
+@PART[C3_Kontainer_03]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = advLogistics
+}
+@PART[C3_Kontainer_04]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = advLogistics
+}
+
+
+@PART[C3_Kontainer_KIS_M]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = storageTech
+}
+
+@PART[C3_Kontainer_KIS_01]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = storageTech
+}
+@PART[C3_Kontainer_KIS_02]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = logistics
+}
+@PART[C3_Kontainer_KIS_03]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = advLogistics
+}
+@PART[C3_Kontainer_KIS_04]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = advLogistics
+}
+
+

FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_01.cfg

@@ -0,0 +1,86 @@
+PART
+{
+// --- general parameters ---
+name = C3_Kontainer_01
+module = Part
+author = RoverDude
+
+// --- asset parameters ---
+
+rescaleFactor = 1
+MODEL
+{
+	model = UmbraSpaceIndustries/Kontainers/Assets/Kontainer
+	texture = Kontainer_11, UmbraSpaceIndustries/Kontainers/Assets/Kontainer_00
+}
+
+
+// --- node definitions ---
+// definition format is Position X, Position Y, Position Z, Up X, Up Y, Up Z
+node_stack_side = 0,0,-0.5,0,0,-1,1
+node_attach = 0,0,-0.5,0,0,1,1
+node_stack_top = 0.0, 1, 0.0, 0.0, 1.0, 0.0, 1
+node_stack_bottom = 0, -1, 0.0, 0.0, -1.0, 0.0, 1
+
+breakingForce = 2072
+breakingTorque = 2072
+
+
+// --- editor parameters ---
+TechRequired = heavierRocketry
+entryCost = 7600
+cost = 3800
+category = none
+subcategory = -1
+title = Kontainer (01.25m)
+manufacturer = USI - Freight Division
+description = Shipping container for transporting various goods
+
+// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
+attachRules = 1,1,1,1,0
+
+
+
+// --- standard part parameters ---
+mass = 0.4
+dragModelType = default
+maximum_drag = 0.20
+minimum_drag = 0.15
+angularDrag = 2
+crashTolerance = 45
+maxTemp = 2000
+bulkheadProfiles = size1,srf
+
+	MODULE
+	{
+		name = FStextureSwitch2
+		textureNames = UmbraSpaceIndustries/Kontainers/Assets/Kontainer_00;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_01;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_02;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_03;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_04;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_05;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_06;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_07;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_08;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_09;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_10;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_11;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_12;;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_13;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_14;;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_15
+		objectNames = Kontainer
+		textureDisplayNames = MetallicOre;Uraninite;Substrate;Minerals;Karbonite;Commodities;RocketParts;Metals;NuclearFuels;Polymers;Supplies;Ore;Machinery;Recyclables;SpecializedParts;Fertilizer
+		useFuelSwitchModule = true
+		fuelTankSetups = 0;1;2;3;4;5;6;7;8;9;10;11;12;13;14;15
+		repaintableEVA = true
+	}
+
+	MODULE
+	{
+		name = FSfuelSwitch
+		resourceNames =MetallicOre;Uraninite;Substrate;Minerals;Karbonite;ExoticMinerals,RareMetals;RocketParts;Metals;EnrichedUranium,DepletedFuel;Polymers;Supplies;Ore;Machinery;Recyclables;SpecializedParts;Fertilizer
+		resourceAmounts = 2500;2500;2500;2500;2500;1250,1250;500;2500;1250,1250;2500;2500;500;2500;2500;2500;2500
+		initialResourceAmounts = 0;0;0;0;0;0,0;0;0;0,0;0;0;0;0;0;0;0
+		tankCost = 7000;5000;4000;5000;4000;377000;5000;38000;1083000;22000;39000;600;50000;25000;100000;14000
+		basePartMass = 0.4
+		tankMass = 0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0
+		hasGUI = false
+	}
+
+	MODULE
+	{
+		name = USI_ModuleResourceWarehouse
+	}
+	MODULE
+	{
+		name = USI_ModuleRecycleBin
+	}
+
+}

FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_02.cfg

@@ -0,0 +1,86 @@
+PART
+{ 
+// --- general parameters ---
+name = C3_Kontainer_02
+module = Part
+author = RoverDude
+
+// --- asset parameters ---
+
+rescaleFactor = 1
+MODEL
+{
+	model = UmbraSpaceIndustries/Kontainers/Assets/Kontainer
+	texture = Kontainer_11, UmbraSpaceIndustries/Kontainers/Assets/Kontainer_01
+	scale = 2,2,2
+}
+
+// --- node definitions ---
+// definition format is Position X, Position Y, Position Z, Up X, Up Y, Up Z
+node_stack_side = 0,0,-1,0,0,-1,2
+node_attach = 0,0,-1,0,0,1,2
+node_stack_top = 0.0, 2, 0.0, 0.0, 1.0, 0.0, 2
+node_stack_bottom = 0, -2, 0.0, 0.0, -1.0, 0.0, 2
+
+breakingForce = 2072
+breakingTorque = 2072
+
+
+// --- editor parameters ---
+TechRequired = heavierRocketry
+entryCost = 7600
+cost = 3800
+category = none
+subcategory = -1
+title = Kontainer (02.5m)
+manufacturer = USI - Freight Division
+description = Shipping container for transporting various goods
+
+// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
+attachRules = 1,1,1,1,0
+
+
+
+// --- standard part parameters ---
+mass = 3.2
+dragModelType = default
+maximum_drag = 0.20
+minimum_drag = 0.15
+angularDrag = 2
+crashTolerance = 45
+maxTemp = 2000
+bulkheadProfiles = size2,srf
+
+	MODULE
+	{
+		name = FStextureSwitch2
+		textureNames = UmbraSpaceIndustries/Kontainers/Assets/Kontainer_00;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_01;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_02;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_03;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_04;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_05;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_06;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_07;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_08;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_09;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_10;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_11;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_12;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_13;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_14;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_15
+		objectNames = Kontainer
+		textureDisplayNames = MetallicOre;Uraninite;Substrate;Minerals;Karbonite;Commodities;RocketParts;Metals;NuclearFuels;Polymers;Supplies;Ore;Machinery;Recyclables;SpecializedParts;Fertilizer
+		useFuelSwitchModule = true
+		fuelTankSetups = 0;1;2;3;4;5;6;7;8;9;10;11;12;13;14;15
+		repaintableEVA = true
+	}
+
+	MODULE
+	{
+		name = FSfuelSwitch
+		resourceNames =MetallicOre;Uraninite;Substrate;Minerals;Karbonite;ExoticMinerals,RareMetals;RocketParts;Metals;EnrichedUranium,DepletedFuel;Polymers;Supplies;Ore;Machinery;Recyclables;SpecializedParts;Fertilizer
+		resourceAmounts = 20000;20000;20000;20000;20000;10000,10000;4000;20000;10000,10000;20000;20000;4000;20000;20000;20000;20000
+		initialResourceAmounts = 0;0;0;0;0;0,0;0;0;0,0;0;0;0;0;0;0;0
+		tankCost = 42000;22000;14000;24000;14000;3008000;28000;292000;8657000;167000;307000;2000;325000;160000;650000;106000
+		basePartMass = 3.2
+		tankMass = 0;0;0;0;0;0;0;0;0;0;0;0;0;0;0
+		hasGUI = false
+	}
+
+	MODULE
+	{
+		name = USI_ModuleResourceWarehouse
+	}
+	MODULE
+	{
+		name = USI_ModuleRecycleBin
+	}
+
+}

FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_03.cfg

@@ -0,0 +1,86 @@
+PART
+{
+// --- general parameters ---
+name = C3_Kontainer_03
+module = Part
+author = RoverDude
+
+// --- asset parameters ---
+
+rescaleFactor = 1
+MODEL
+{
+	model = UmbraSpaceIndustries/Kontainers/Assets/Kontainer
+	texture = Kontainer_11, UmbraSpaceIndustries/Kontainers/Assets/Kontainer_02
+	scale = 3,3,3
+}
+
+// --- node definitions ---
+// definition format is Position X, Position Y, Position Z, Up X, Up Y, Up Z
+node_stack_side = 0,0,-1.5,0,0,-1,3
+node_attach = 0,0,-1.5,0,0,1,3
+node_stack_top = 0.0, 3, 0.0, 0.0, 1.0, 0.0, 3
+node_stack_bottom = 0, -3, 0.0, 0.0, -1.0, 0.0, 3
+
+breakingForce = 2072
+breakingTorque = 2072
+
+
+// --- editor parameters ---
+TechRequired = heavierRocketry
+entryCost = 7600
+cost = 3800
+category = none
+subcategory = -1
+title = Kontainer (03.75m)
+manufacturer = USI - Freight Division
+description = Shipping container for transporting various goods
+
+// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
+attachRules = 1,1,1,1,0
+
+
+
+// --- standard part parameters ---
+mass = 10.4
+dragModelType = default
+maximum_drag = 0.20
+minimum_drag = 0.15
+angularDrag = 2
+crashTolerance = 45
+maxTemp = 2000
+bulkheadProfiles = size3,srf
+
+	MODULE
+	{
+		name = FStextureSwitch2
+		textureNames = UmbraSpaceIndustries/Kontainers/Assets/Kontainer_00;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_01;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_02;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_03;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_04;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_05;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_06;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_07;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_08;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_09;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_10;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_11;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_12;;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_13;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_14;UmbraSpaceIndustries/Kontainers/Assets/Kontainer_15
+		objectNames = Kontainer
+		textureDisplayNames = MetallicOre;Uraninite;Substrate;Minerals;Karbonite;Commodities;RocketParts;Metals;NuclearFuels;Polymers;Supplies;Ore;Machinery;Recyclables;SpecializedParts;Fertilizer
+		useFuelSwitchModule = true
+		fuelTankSetups = 0;1;2;3;4;5;6;7;8;9;10;11;12;13;14;15;
+		repaintableEVA = true
+	}
+
+	MODULE
+	{
+		name = FSfuelSwitch
+		resourceNames =MetallicOre;Uraninite;Substrate;Minerals;Karbonite;ExoticMinerals,RareMetals;RocketParts;Metals;EnrichedUranium,DepletedFuel;Polymers;Supplies;Ore;Machinery;Recyclables;SpecializedParts;Fertilizer
+		resourceAmounts = 65000;65000;65000;65000;65000;32500,32500;13000;65000;32500,32500;65000;65000;13000;65000;65000;65000;65000
+		initialResourceAmounts = 0;0;0;0;0;0,0;0;0;0,0;0;0;0;0;0;0;0
+		tankCost = 136000;67000;42000;74000;43000;9772000;87000;948000;28134000;542000;997000;5000;1042000;460000;2110000;345000
+		basePartMass = 10.4
+		tankMass = 0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0
+		hasGUI = false
+	}
+
+	MODULE
+	{
+		name = USI_ModuleResourceWarehouse
+	}
+	MODULE
+	{
+		name = USI_ModuleRecycleBin
+	}
+
+}