Merge pull request #106 from zer0Kerbal/1.2.0.0

1.2.0.0 (2015-08-31) - Minor update

FuelTanksPlus.version

@@ -12,7 +12,7 @@
 	"VERSION" :
 	{
 		"MAJOR" : 1,
-		"MINOR" : 1,
+		"MINOR" : 2,
 		"PATCH" : 0,
 		"BUILD" : 0
 	},

GameData/NecroBones/FuelTanksPlus/FuelTanksPlus-CHANGELOG.txt

@@ -1,6 +1,18 @@
+1.2 (2015-08-31) - Minor update.
+ - Corrected a texture alignment problem with the 0.625m tanks when using reduced texture resolution.
+ - Added new red color option to the 0.625m tanks.
+ - Added a second, shorter 3.75m to 2.5m adapter tank. 
+ - Added mod support settings for adapter tanks.
+    - Added TweakScale (adapter) settings.
+    - Added Modular Fuel Tanks settings.
+    - Added Fuel Switch settings.
+
+1.1.1 (2015-08-27) - Hotfix
+ - Corrected the transparent meshes in the FL-T50 fuel tank.
+
 1.1 (2015-08-27) - Fixes, New things.
- - FTP: Added a blue "Delta" variant at the 1.25m size, historically inspired by Delta, Delta II, etc.
- - FTP: Renamed 2.5m colors, to be more historically minded with regards to Delta IV and Delta IV Heavy.
+ - Added a blue "Delta" variant at the 1.25m size, historically inspired by Delta, Delta II, etc.
+ - Renamed 2.5m colors, to be more historically minded with regards to Delta IV and Delta IV Heavy.
     - The blue color is renamed from "Delta" to "Blue"
     - The orange color is renamed from "Jumbo" to "Delta"
  - Corrected the base (dry) mass of the triangular probe tank.

GameData/NecroBones/FuelTanksPlus/FuelTanksPlus.version

@@ -1,15 +1,36 @@
 {
-	"NAME": "Fuel Tanks Plus",
-	"URL": "http://ksp.necrobones.com/files/FuelTanksPlus/FuelTanksPlus.version",
-	"DOWNLOAD": "https://kerbalstuff.com/mod/529/Fuel%20Tanks%20Plus",
-	"VERSION": {
-		"MAJOR": 1,
-		"MINOR": 1,
-		"PATCH": 0
-	},
-	"KSP_VERSION_MIN": {
-		"MAJOR": 1,
-		"MINOR": 0,
-		"PATCH": 4
+	"NAME"		     : "FuelTanksPlus (FTP)",
+	"URL"			 : "https://raw.githubusercontent.com/zer0Kerbal/FuelTanksPlus/master/FuelTanksPlus.version",
+	"DOWNLOAD"	     : "https://github.com/zer0Kerbal/FuelTanksPlus/releases/latest",
+	"CHANGE_LOG_URL" : "https://raw.githubusercontent.com/zer0Kerbal/FuelTanksPlus/master/changelog.md",
+	"GITHUB" :
+	{
+		"USERNAME"	        : "zer0Kerbal",
+		"REPOSITORY"		: "FuelTanksPlus",
+		"ALLOW_PRE_RELEASE" : false
+	},
+	"VERSION" :
+	{
+		"MAJOR" : 1,
+		"MINOR" : 2,
+		"PATCH" : 0,
+		"BUILD" : 0
+	},
+	"KSP_VERSION" :
+	{
+		"MAJOR" : 1,
+		"MINOR" : 0,
+		"PATCH" : 4
+	},
+	"KSP_VERSION_MIN" :
+	{
+		"MAJOR" : 0,
+		"MINOR" : 9,
+		"PATCH" : 0
+	},
+	"INSTALL_LOC" :
+	{
+		"NAME"      : "FuelTanksPlus",
+		"DIRECTORY" : "NecroBones/FuelTanksPlus"
 	}
 }

GameData/NecroBones/FuelTanksPlus/FuelTanksPlus_FuelSwitch.cfg

@@ -438,6 +438,54 @@
 		tankMass = 0.0;0.0;10.35;0;4.5
 	}
 }
+@PART[TPtank3m2mA]:FOR[FuelTanksPlus]:NEEDS[!InterstellarFuelSwitch|InterstellarFuelSwitch&!CryoEngines]
+{
+	MODULE
+	{
+		name:NEEDS[!InterstellarFuelSwitch|CryoEngines] = FSfuelSwitch
+		name:NEEDS[InterstellarFuelSwitch&!CryoEngines] = InterstellarFuelSwitch
+		resourceGui:NEEDS[InterstellarFuelSwitch] = LiquidFuel+Oxidizer;LiquidFuel;Oxidizer
+		resourceNames = LiquidFuel,Oxidizer;LiquidFuel;Oxidizer
+		resourceAmounts = 2284.2,2791.8;4568.4;5583.6
+		basePartMass = 3.1725
+	}
+}
+@PART[TPtank3m2mA2]:FOR[FuelTanksPlus]:NEEDS[!InterstellarFuelSwitch|InterstellarFuelSwitch&!CryoEngines]
+{
+	MODULE
+	{
+		name:NEEDS[!InterstellarFuelSwitch|CryoEngines] = FSfuelSwitch
+		name:NEEDS[InterstellarFuelSwitch&!CryoEngines] = InterstellarFuelSwitch
+		resourceGui:NEEDS[InterstellarFuelSwitch] = LiquidFuel+Oxidizer;LiquidFuel;Oxidizer
+		resourceNames = LiquidFuel,Oxidizer;LiquidFuel;Oxidizer
+		resourceAmounts = 1370.52,1675.08;2741.04;3350.16
+		basePartMass = 1.9035
+	}
+}
+@PART[TPtank2m1mA]:FOR[FuelTanksPlus]:NEEDS[!InterstellarFuelSwitch|InterstellarFuelSwitch&!CryoEngines]
+{
+	MODULE
+	{
+		name:NEEDS[!InterstellarFuelSwitch|CryoEngines] = FSfuelSwitch
+		name:NEEDS[InterstellarFuelSwitch&!CryoEngines] = InterstellarFuelSwitch
+		resourceGui:NEEDS[InterstellarFuelSwitch] = LiquidFuel+Oxidizer;LiquidFuel;Oxidizer
+		resourceNames = LiquidFuel,Oxidizer;LiquidFuel;Oxidizer
+		resourceAmounts = 360,440;720;880
+		basePartMass = 0.5
+	}
+}
+@PART[TPtank1m0mA]:FOR[FuelTanksPlus]:NEEDS[!InterstellarFuelSwitch|InterstellarFuelSwitch&!CryoEngines]
+{
+	MODULE
+	{
+		name:NEEDS[!InterstellarFuelSwitch|CryoEngines] = FSfuelSwitch
+		name:NEEDS[InterstellarFuelSwitch&!CryoEngines] = InterstellarFuelSwitch
+		resourceGui:NEEDS[InterstellarFuelSwitch] = LiquidFuel+Oxidizer;LiquidFuel;Oxidizer
+		resourceNames = LiquidFuel,Oxidizer;LiquidFuel;Oxidizer
+		resourceAmounts = 45,55;90;110
+		basePartMass = 0.0625
+	}
+}
 @PART[TP*]:HAS[@]:NEEDS[InterstellarFuelSwitch]
 {
     	@MODULE[InterstellarFuelSwitch]

GameData/NecroBones/FuelTanksPlus/FuelTanksPlus_ModularFuelTanks.cfg

@@ -304,6 +304,42 @@
 	type = Default
     }
 }
+@PART[TPtank3m2mA]:FOR[FuelTanksPlus]:NEEDS[ModularFuelTanks]
+{
+    MODULE
+    {
+	name = ModuleFuelTanks
+	volume = 5076
+	type = Default
+    }
+}
+@PART[TPtank3m2mA2]:FOR[FuelTanksPlus]:NEEDS[ModularFuelTanks]
+{
+    MODULE
+    {
+	name = ModuleFuelTanks
+	volume = 3045
+	type = Default
+    }
+}
+@PART[TPtank2m1mA]:FOR[FuelTanksPlus]:NEEDS[ModularFuelTanks]
+{
+    MODULE
+    {
+	name = ModuleFuelTanks
+	volume = 800
+	type = Default
+    }
+}
+@PART[TPtank1m0mA]:FOR[FuelTanksPlus]:NEEDS[ModularFuelTanks]
+{
+    MODULE
+    {
+	name = ModuleFuelTanks
+	volume = 100
+	type = Default
+    }
+}
 
 // Fix-ups:
 

GameData/NecroBones/FuelTanksPlus/FuelTanksPlus_TweakScale.cfg

@@ -34,7 +34,7 @@
 		defaultScale = 3.75
 	}
 }
-@PART[TPtank0m*]:NEEDS[TweakScale]
+@PART[TPtank0mL*]:NEEDS[TweakScale]
 {
 	MODULE
 	{
@@ -43,7 +43,7 @@
 		defaultScale = 0.625
 	}
 }
-@PART[TPtank1m*]:NEEDS[TweakScale]
+@PART[TPtank1mL*]:NEEDS[TweakScale]
 {
 	MODULE
 	{
@@ -52,7 +52,16 @@
 		defaultScale = 1.25
 	}
 }
-@PART[TPtank2m*]:NEEDS[TweakScale]
+@PART[TPtank1m0m*]:NEEDS[TweakScale]
+{
+	MODULE
+	{
+		name = TweakScale
+		type = adapter_2_1
+		defaultScale = 1.25
+	}
+}
+@PART[TPtank2mL*]:NEEDS[TweakScale]
 {
 	MODULE
 	{
@@ -61,7 +70,16 @@
 		defaultScale = 2.5
 	}
 }
-@PART[TPtank3m*]:NEEDS[TweakScale]
+@PART[TPtank2m1m*]:NEEDS[TweakScale]
+{
+	MODULE
+	{
+		name = TweakScale
+		type = adapter_2_1
+		defaultScale = 2.5
+	}
+}
+@PART[TPtank3mL*]:NEEDS[TweakScale]
 {
 	MODULE
 	{
@@ -70,6 +88,15 @@
 		defaultScale = 3.75
 	}
 }
+@PART[TPtank3m2m*]:NEEDS[TweakScale]
+{
+	MODULE
+	{
+		name = TweakScale
+		type = adapter_3_2
+		defaultScale = 3.75
+	}
+}
 @PART[TPtankR*]:NEEDS[TweakScale]
 {
 	MODULE

GameData/NecroBones/FuelTanksPlus/Size0/000_TPtank0m_MM.cfg

@@ -4,8 +4,8 @@
 	{
 		name:NEEDS[!InterstellarFuelSwitch] = FSmeshSwitch
 		name:NEEDS[InterstellarFuelSwitch] = InterstellarMeshSwitch
-		objects = TPtank0m-Grey;TPtank0m-White;TPtank0m-Checkered;TPtank0m-Black
-		objectDisplayNames = Oscar;Juno;Astrobee;Brant
+		objects = TPtank0m-Grey;TPtank0m-White;TPtank0m-Checkered;TPtank0m-Black;TPtank0m-Red
+		objectDisplayNames = Oscar;Juno;Astrobee;Brant;Red
 		affectColliders = false
 		buttonName = Next Variant
 		previousButtonName = Previous Variant

GameData/NecroBones/FuelTanksPlus/Size3/000_TPtank3m_MM.cfg

@@ -1,4 +1,4 @@
-@PART[TPcone3m|TPdome3m|TPtank3mL?????|TPtank3m2mA]
+@PART[TPcone3m|TPdome3m|TPtank3mL?????|TPtank3m2mA*]
 {
 	MODULE
 	{

GameData/NecroBones/FuelTanksPlus/Size3/TPtank3m2mA2.cfg

@@ -0,0 +1,81 @@
+PART
+{
+name = TPtank3m2mA2
+module = Part
+author = NecroBones
+
+MODEL {
+	model = FuelTanksPlus/Size3/TPtank3m2mA2
+	texture = orange-jumbo-0, Squad/Parts/FuelTank/fuelTankJumbo-64/model000
+	texture = orange-jumbo-1, Squad/Parts/FuelTank/fuelTankJumbo-64/model001
+	texture = TPtank2m-Specular, FuelTanksPlus/Size2/TPtank2m-Specular
+	scale = 1.0, 1.0, 1.0
+}
+scale = 1.0
+rescaleFactor = 1.0
+
+node_stack_bottom = 0.0, -1.0, 0.0, 0.0, -1.0, 0.0, 2
+node_stack_top = 0.0, 1.25, 0.0, 0.0, 1.0, 0.0, 3
+
+TechRequired = largeVolumeContainment
+entryCost = 7200
+cost = 2760
+category = Propulsion
+subcategory = 0
+title = Kerbodyne S3-3045-FTP Adapter Tank
+manufacturer = Fuel Tanks Plus
+description = A super-heavy fuel tank, intended for the largest boosters you will need. Manufactured in cooperation with Fuel Tanks Plus, Inc.
+
+attachRules = 1,0,1,1,0
+
+mass = 1.9035
+dragModelType = default
+maximum_drag = 0.2
+minimum_drag = 0.3
+angularDrag = 2
+crashTolerance = 6
+breakingForce = 550
+breakingTorque = 550
+maxTemp = 2000
+bulkheadProfiles = size3, size2
+
+MODULE
+{
+	name = ModuleJettison
+	jettisonName = TPtankShroudTop
+	bottomNodeName = top
+	isFairing = True
+	jettisonedObjectMass = 0.1
+	jettisonForce = 0.1
+	jettisonDirection = 0 0 1
+
+}
+MODULE
+{
+	name = ModuleJettison
+	jettisonName = TPtankShroudBottom
+	bottomNodeName = bottom
+	isFairing = True
+	jettisonedObjectMass = 0.1
+	jettisonForce = 0.1
+	jettisonDirection = 0 0 1
+
+}
+
+
+RESOURCE
+{
+ name = LiquidFuel
+ amount = 1370.52
+ maxAmount = 1370.52
+}
+
+RESOURCE
+{
+ name = Oxidizer
+ amount = 1675.08
+ maxAmount = 1675.08
+}
+
+
+}

json/mod.json

@@ -2,7 +2,7 @@
  "schemaVersion": 1,
  "label": "Fuel Tanks Plus",
  "labelColor": "BADA55",
- "message": "1.1.0.0",
+ "message": "1.2.0.0",
  "color": "darkgreen",
  "style": "plastic"
 }