Merge pull request #123 from zer0Kerbal/1.10.0.0

1.10.0.0 (2016-06-04) - Update
zer0Kerbal · Apr 12, 2022 · 01b7786 · 01b7786
2 parents dfdac78 + 9857289
commit 01b7786
Show file tree

Hide file tree

Showing 29 changed files with 78 additions and 25 deletions.
diff --git a/FuelTanksPlus.version b/FuelTanksPlus.version
@@ -12,15 +12,15 @@
 	"VERSION" :
 	{
 		"MAJOR" : 1,
-		"MINOR" : 9,
-		"PATCH" : 3,
+		"MINOR" : 10,
+		"PATCH" : 0,
 		"BUILD" : 0
 	},
 	"KSP_VERSION" :
 	{
 		"MAJOR" : 1,
 		"MINOR" : 1,
-		"PATCH" : 0
+		"PATCH" : 3
 	},
 	"KSP_VERSION_MIN" :
 	{

diff --git a/GameData/NecroBones/FuelTanksPlus/FuelTanksPlus-CHANGELOG.txt b/GameData/NecroBones/FuelTanksPlus/FuelTanksPlus-CHANGELOG.txt
@@ -1,3 +1,7 @@
+1.10 (2016-06-04) - Update.
+ - Altered switcher priorities for mesh switching, to match fuel switching rules.
+ - Added color choices from some adjacent diameters to the 1.25m and 2.5m tanks.
+
 1.9.3 (2016-05-10) - Tweaks.
  - Altered the color-switching rules to be based on variables rather than part names, for more flexibility and support for part duplication.
 

diff --git a/GameData/NecroBones/FuelTanksPlus/FuelTanksPlus.version b/GameData/NecroBones/FuelTanksPlus/FuelTanksPlus.version
@@ -12,15 +12,15 @@
 	"VERSION" :
 	{
 		"MAJOR" : 1,
-		"MINOR" : 9,
-		"PATCH" : 3,
+		"MINOR" : 10,
+		"PATCH" : 0,
 		"BUILD" : 0
 	},
 	"KSP_VERSION" :
 	{
 		"MAJOR" : 1,
 		"MINOR" : 1,
-		"PATCH" : 0
+		"PATCH" : 3
 	},
 	"KSP_VERSION_MIN" :
 	{

diff --git a/GameData/NecroBones/FuelTanksPlus/Probe/000_TPtankP_MM.cfg b/GameData/NecroBones/FuelTanksPlus/Probe/000_TPtankP_MM.cfg
@@ -1,4 +1,4 @@
-@PART[TP*]:HAS[#FTPcolorSwitch[probe]]:NEEDS[Firespitter|InterstellarFuelSwitch&!B9PartSwitch]:AFTER[FuelTanksPlus]
+@PART[TP*]:HAS[#FTPcolorSwitch[probe]]:NEEDS[Firespitter|InterstellarFuelSwitch]:AFTER[FuelTanksPlus]
 {
 	MODULE
 	{
@@ -13,7 +13,7 @@
 	!FTPcolorSwitch = delete
 }
 
-@PART[TP*]:HAS[#FTPcolorSwitch[probe]]:NEEDS[B9PartSwitch]:AFTER[FuelTanksPlus]
+@PART[TP*]:HAS[#FTPcolorSwitch[probe]]:NEEDS[B9PartSwitch&!Firespitter&!InterstellarFuelSwitch]:AFTER[FuelTanksPlus]
 {
 	MODULE
 	{

diff --git a/GameData/NecroBones/FuelTanksPlus/Size0/000_TPtank0m_MM.cfg b/GameData/NecroBones/FuelTanksPlus/Size0/000_TPtank0m_MM.cfg
@@ -1,4 +1,4 @@
-@PART[TP*]:HAS[#FTPcolorSwitch[0m]]:NEEDS[Firespitter|InterstellarFuelSwitch&!B9PartSwitch]:AFTER[FuelTanksPlus]
+@PART[TP*]:HAS[#FTPcolorSwitch[0m]]:NEEDS[Firespitter|InterstellarFuelSwitch]:AFTER[FuelTanksPlus]
 {
 	MODULE
 	{
@@ -13,7 +13,7 @@
 	!FTPcolorSwitch = delete
 }
 
-@PART[TP*]:HAS[#FTPcolorSwitch[0m]]:NEEDS[B9PartSwitch]:AFTER[FuelTanksPlus]
+@PART[TP*]:HAS[#FTPcolorSwitch[0m]]:NEEDS[B9PartSwitch&!Firespitter&!InterstellarFuelSwitch]:AFTER[FuelTanksPlus]
 {
 	MODULE
 	{

diff --git a/GameData/NecroBones/FuelTanksPlus/Size1/000_TPtank1m_MM.cfg b/GameData/NecroBones/FuelTanksPlus/Size1/000_TPtank1m_MM.cfg
@@ -1,19 +1,27 @@
-@PART[TP*]:HAS[#FTPcolorSwitch[1m]]:NEEDS[Firespitter|InterstellarFuelSwitch&!B9PartSwitch]:AFTER[FuelTanksPlus]
+@PART[TP*]:HAS[#FTPcolorSwitch[1m]]:AFTER[FuelTanksPlus]
+{
+	@MODEL
+	{
+		texture = TPtank0m-Specular, FuelTanksPlus/Size0/TPtank0m-Specular
+		texture = TPtank2m-Specular, FuelTanksPlus/Size2/TPtank2m-Specular
+	}
+}
+@PART[TP*]:HAS[#FTPcolorSwitch[1m]]:NEEDS[Firespitter|InterstellarFuelSwitch]:AFTER[FuelTanksPlus]
 {
 	MODULE
 	{
 		name:NEEDS[!InterstellarFuelSwitch] = FSmeshSwitch
 		name:NEEDS[InterstellarFuelSwitch] = InterstellarMeshSwitch
-		objects = TPtank1m-White;TPtank1m-Checkered;TPtank1m-Black;TPtank1m-Green;TPtank1m-Blue
-		objectDisplayNames = Vega;Redstone;Vanguard;Soyuz;Delta
+		objects = TPtank1m-White;TPtank1m-Checkered;TPtank1m-Black;TPtank1m-Green;TPtank1m-Blue;TPtank1m-0mRed;TPtank1m-2mRed;TPtank1m-2mBlue
+		objectDisplayNames = Vega;Redstone;Vanguard;Soyuz;Delta;Titan;Atlas;Blue
 		affectColliders = false
 		buttonName = Next Color Scheme
 		previousButtonName = Previous Color Scheme
 	}
 	!FTPcolorSwitch = delete
 }
 
-@PART[TP*]:HAS[#FTPcolorSwitch[1m]]:NEEDS[B9PartSwitch]:AFTER[FuelTanksPlus]
+@PART[TP*]:HAS[#FTPcolorSwitch[1m]]:NEEDS[B9PartSwitch&!Firespitter&!InterstellarFuelSwitch]:AFTER[FuelTanksPlus]
 {
 	MODULE
 	{
@@ -47,6 +55,21 @@
 			name = Delta
 			transform = TPtank1m-Blue
 		}
+		SUBTYPE
+		{
+			name = Titan
+			transform = TPtank1m-0mRed
+		}
+		SUBTYPE
+		{
+			name = Atlas
+			transform = TPtank1m-2mRed
+		}
+		SUBTYPE
+		{
+			name = Blue
+			transform = TPtank1m-2mBlue
+		}
 	}
 	!FTPcolorSwitch = delete
 }
diff --git a/GameData/NecroBones/FuelTanksPlus/Size1/TPcone1m1.mu b/GameData/NecroBones/FuelTanksPlus/Size1/TPcone1m1.mu
diff --git a/GameData/NecroBones/FuelTanksPlus/Size1/TPcone1m2.mu b/GameData/NecroBones/FuelTanksPlus/Size1/TPcone1m2.mu
diff --git a/GameData/NecroBones/FuelTanksPlus/Size1/TPdecoupler1m.mu b/GameData/NecroBones/FuelTanksPlus/Size1/TPdecoupler1m.mu
diff --git a/GameData/NecroBones/FuelTanksPlus/Size1/TPdome1m1.mu b/GameData/NecroBones/FuelTanksPlus/Size1/TPdome1m1.mu
diff --git a/GameData/NecroBones/FuelTanksPlus/Size1/TPtank1m0mA.cfg b/GameData/NecroBones/FuelTanksPlus/Size1/TPtank1m0mA.cfg
@@ -10,7 +10,6 @@ MODEL {
 	model = FuelTanksPlus/Size1/TPtank1m0mA
 	texture = orange-jumbo-0, Squad/Parts/FuelTank/fuelTankJumbo-64/model000
 	texture = orange-jumbo-1, Squad/Parts/FuelTank/fuelTankJumbo-64/model001
-	texture = TPtank0m-Specular, FuelTanksPlus/Size0/TPtank0m-Specular
 	scale = 1.0, 1.0, 1.0
 }
 scale = 1.0

diff --git a/GameData/NecroBones/FuelTanksPlus/Size1/TPtank1m0mA.mu b/GameData/NecroBones/FuelTanksPlus/Size1/TPtank1m0mA.mu
diff --git a/GameData/NecroBones/FuelTanksPlus/Size1/TPtank1mL00313.mu b/GameData/NecroBones/FuelTanksPlus/Size1/TPtank1mL00313.mu
diff --git a/GameData/NecroBones/FuelTanksPlus/Size1/TPtank1mL05625.mu b/GameData/NecroBones/FuelTanksPlus/Size1/TPtank1mL05625.mu
diff --git a/GameData/NecroBones/FuelTanksPlus/Size1/TPtank2m-Specular.mbm b/GameData/NecroBones/FuelTanksPlus/Size1/TPtank2m-Specular.mbm
diff --git a/GameData/NecroBones/FuelTanksPlus/Size2/000_TPtank2m_MM.cfg b/GameData/NecroBones/FuelTanksPlus/Size2/000_TPtank2m_MM.cfg
@@ -1,19 +1,27 @@
-@PART[TP*]:HAS[#FTPcolorSwitch[2m]]:NEEDS[Firespitter|InterstellarFuelSwitch&!B9PartSwitch]:AFTER[FuelTanksPlus]
+@PART[TP*]:HAS[#FTPcolorSwitch[2m]]:AFTER[FuelTanksPlus]
+{
+	@MODEL
+	{
+		texture = TPtank1m-Specular, FuelTanksPlus/Size1/TPtank1m-Specular
+		texture = TPtank3m-Specular, FuelTanksPlus/Size3/TPtank3m-Specular
+	}
+}
+@PART[TP*]:HAS[#FTPcolorSwitch[2m]]:NEEDS[Firespitter|InterstellarFuelSwitch]:AFTER[FuelTanksPlus]
 {
 	MODULE
 	{
 		name:NEEDS[!InterstellarFuelSwitch] = FSmeshSwitch
 		name:NEEDS[InterstellarFuelSwitch] = InterstellarMeshSwitch
-		objects = TPtank2m-Orange,TPtank2m-Orange2;TPtank2m-White;TPtank2m-Checkered;TPtank2m-Black;TPtank2m-Blue;TPtank2m-Red
-		objectDisplayNames = Delta;Antares;Gemini;Black;Blue;Atlas
+		objects = TPtank2m-Orange,TPtank2m-Orange2;TPtank2m-White;TPtank2m-Checkered;TPtank2m-Black;TPtank2m-Blue;TPtank2m-Red;TPtank2m-1mBlue;TPtank2m-1mGreen;TPtank2m-3mSilver;TPtank2m-3mTan
+		objectDisplayNames = Delta4;Antares;Gemini;Black;Blue;Atlas;Delta2;Soyuz;Titan;Ariane
 		affectColliders = false
 		buttonName = Next Color Scheme
 		previousButtonName = Previous Color Scheme
 	}
 	!FTPcolorSwitch = delete
 }
 
-@PART[TP*]:HAS[#FTPcolorSwitch[2m]]:NEEDS[B9PartSwitch]:AFTER[FuelTanksPlus]
+@PART[TP*]:HAS[#FTPcolorSwitch[2m]]:NEEDS[B9PartSwitch&!Firespitter&!InterstellarFuelSwitch]:AFTER[FuelTanksPlus]
 {
 	MODULE
 	{
@@ -24,7 +32,7 @@
 
 		SUBTYPE
 		{
-			name = Delta
+			name = Delta4
 			transform = TPtank2m-Orange
 			transform = TPtank2m-Orange2
 		}		
@@ -53,6 +61,26 @@
 			name = Atlas
 			transform = TPtank2m-Red
 		}
+		SUBTYPE
+		{
+			name = Delta2
+			transform = TPtank2m-1mBlue
+		}		
+		SUBTYPE
+		{
+			name = Soyuz
+			transform = TPtank2m-1mGreen
+		}
+		SUBTYPE
+		{
+			name = Titan
+			transform = TPtank2m-3mSilver
+		}		
+		SUBTYPE
+		{
+			name = Ariane
+			transform = TPtank2m-3mTan
+		}
 	}
 	!FTPcolorSwitch = delete
 }
diff --git a/GameData/NecroBones/FuelTanksPlus/Size2/TPcone2m.mu b/GameData/NecroBones/FuelTanksPlus/Size2/TPcone2m.mu
diff --git a/GameData/NecroBones/FuelTanksPlus/Size2/TPdecoupler2m.mu b/GameData/NecroBones/FuelTanksPlus/Size2/TPdecoupler2m.mu
diff --git a/GameData/NecroBones/FuelTanksPlus/Size2/TPdome2m.mu b/GameData/NecroBones/FuelTanksPlus/Size2/TPdome2m.mu
diff --git a/GameData/NecroBones/FuelTanksPlus/Size2/TPtank2m1mA.cfg b/GameData/NecroBones/FuelTanksPlus/Size2/TPtank2m1mA.cfg
@@ -10,7 +10,6 @@ MODEL {
 	model = FuelTanksPlus/Size2/TPtank2m1mA
 	texture = orange-jumbo-0, Squad/Parts/FuelTank/fuelTankJumbo-64/model000
 	texture = orange-jumbo-1, Squad/Parts/FuelTank/fuelTankJumbo-64/model001
-	texture = TPtank1m-Specular, FuelTanksPlus/Size1/TPtank1m-Specular
 	scale = 1.0, 1.0, 1.0
 }
 scale = 1.0

diff --git a/GameData/NecroBones/FuelTanksPlus/Size2/TPtank2m1mA.mu b/GameData/NecroBones/FuelTanksPlus/Size2/TPtank2m1mA.mu
diff --git a/GameData/NecroBones/FuelTanksPlus/Size2/TPtank2mL00469.mu b/GameData/NecroBones/FuelTanksPlus/Size2/TPtank2mL00469.mu
diff --git a/GameData/NecroBones/FuelTanksPlus/Size2/TPtank2mL05625.mu b/GameData/NecroBones/FuelTanksPlus/Size2/TPtank2mL05625.mu
diff --git a/GameData/NecroBones/FuelTanksPlus/Size2/TPtank2mL11250.mu b/GameData/NecroBones/FuelTanksPlus/Size2/TPtank2mL11250.mu
diff --git a/GameData/NecroBones/FuelTanksPlus/Size2/TPtank2mL15000.mu b/GameData/NecroBones/FuelTanksPlus/Size2/TPtank2mL15000.mu
diff --git a/GameData/NecroBones/FuelTanksPlus/Size2/TPtank3m-Specular.mbm b/GameData/NecroBones/FuelTanksPlus/Size2/TPtank3m-Specular.mbm
diff --git a/GameData/NecroBones/FuelTanksPlus/Size3/000_TPtank3m_MM.cfg b/GameData/NecroBones/FuelTanksPlus/Size3/000_TPtank3m_MM.cfg
@@ -1,4 +1,4 @@
-@PART[TP*]:HAS[#FTPcolorSwitch[3m]]:NEEDS[Firespitter|InterstellarFuelSwitch&!B9PartSwitch]:AFTER[FuelTanksPlus]
+@PART[TP*]:HAS[#FTPcolorSwitch[3m]]:NEEDS[Firespitter|InterstellarFuelSwitch]:AFTER[FuelTanksPlus]
 {
 	MODULE
 	{
@@ -13,7 +13,7 @@
 	!FTPcolorSwitch = delete
 }
 
-@PART[TP*]:HAS[#FTPcolorSwitch[3m]]:NEEDS[B9PartSwitch]:AFTER[FuelTanksPlus]
+@PART[TP*]:HAS[#FTPcolorSwitch[3m]]:NEEDS[B9PartSwitch&!Firespitter&!InterstellarFuelSwitch]:AFTER[FuelTanksPlus]
 {
 	MODULE
 	{

diff --git a/json/ksp.json b/json/ksp.json
@@ -2,7 +2,7 @@
  "schemaVersion": 1,
  "label": "KSP",
  "labelColor": "black",
- "message": "1.1.0",
+ "message": "1.1.3",
  "color": "66ccff",
  "style": "plastic"
 }
diff --git a/json/mod.json b/json/mod.json
@@ -2,7 +2,7 @@
  "schemaVersion": 1,
  "label": "Fuel Tanks Plus",
  "labelColor": "BADA55",
- "message": "1.9.3.0",
+ "message": "1.10.0.0",
  "color": "darkgreen",
  "style": "plastic"
 }