Merge pull request #122 from zer0Kerbal/1.9.3.0

1.9.3.0 (2016-05-10) - Tweaks
zer0Kerbal · Apr 12, 2022 · dfdac78 · dfdac78
2 parents c366d3c + 7c11c74
commit dfdac78
Show file tree

Hide file tree

Showing 43 changed files with 94 additions and 13 deletions.
diff --git a/FuelTanksPlus.version b/FuelTanksPlus.version
@@ -13,7 +13,7 @@
 	{
 		"MAJOR" : 1,
 		"MINOR" : 9,
-		"PATCH" : 2,
+		"PATCH" : 3,
 		"BUILD" : 0
 	},
 	"KSP_VERSION" :

diff --git a/GameData/NecroBones/FuelTanksPlus/FuelTanksPlus-CHANGELOG.txt b/GameData/NecroBones/FuelTanksPlus/FuelTanksPlus-CHANGELOG.txt
@@ -1,3 +1,6 @@
+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.
+
 1.9.2 (2016-05-07) - Fuel Switching Tweaks.
  - Added InterstellarFuelSwitch 2.0.2 flags to re-tie radial tank texture to fuel type.
  - Reduced dry mass of radial tanks when containing MonoPropellant, to better match stock tanks (Firespitter and InterstellarFuelSwitch).

diff --git a/GameData/NecroBones/FuelTanksPlus/FuelTanksPlus.version b/GameData/NecroBones/FuelTanksPlus/FuelTanksPlus.version
@@ -13,7 +13,7 @@
 	{
 		"MAJOR" : 1,
 		"MINOR" : 9,
-		"PATCH" : 2,
+		"PATCH" : 3,
 		"BUILD" : 0
 	},
 	"KSP_VERSION" :

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[TPtankTri|TPtankCube???]:NEEDS[Firespitter|InterstellarFuelSwitch&!B9PartSwitch]:AFTER[FuelTanksPlus]
+@PART[TP*]:HAS[#FTPcolorSwitch[probe]]:NEEDS[Firespitter|InterstellarFuelSwitch&!B9PartSwitch]:AFTER[FuelTanksPlus]
 {
 	MODULE
 	{
@@ -10,9 +10,10 @@
 		buttonName = Next Color Scheme
 		previousButtonName = Previous Color Scheme
 	}
+	!FTPcolorSwitch = delete
 }
 
-@PART[TPtankTri|TPtankCube???]:NEEDS[B9PartSwitch]:AFTER[FuelTanksPlus]
+@PART[TP*]:HAS[#FTPcolorSwitch[probe]]:NEEDS[B9PartSwitch]:AFTER[FuelTanksPlus]
 {
 	MODULE
 	{
@@ -32,4 +33,5 @@
 			transform = TPprobe-Silver
 		}
 	}
+	!FTPcolorSwitch = delete
 }
diff --git a/GameData/NecroBones/FuelTanksPlus/Probe/TPtankCube00500.cfg b/GameData/NecroBones/FuelTanksPlus/Probe/TPtankCube00500.cfg
@@ -4,6 +4,8 @@ name = TPtankCube050
 module = Part
 author = NecroBones
 
+FTPcolorSwitch = probe
+
 MODEL {
 	model = FuelTanksPlus/Probe/TPtankCube00500
 	scale = 1.0, 1.0, 1.0

diff --git a/GameData/NecroBones/FuelTanksPlus/Probe/TPtankCube00750.cfg b/GameData/NecroBones/FuelTanksPlus/Probe/TPtankCube00750.cfg
@@ -4,6 +4,8 @@ name = TPtankCube075
 module = Part
 author = NecroBones
 
+FTPcolorSwitch = probe
+
 MODEL {
 	model = FuelTanksPlus/Probe/TPtankCube00750
 	scale = 1.0, 1.0, 1.0

diff --git a/GameData/NecroBones/FuelTanksPlus/Probe/TPtankCube01250.cfg b/GameData/NecroBones/FuelTanksPlus/Probe/TPtankCube01250.cfg
@@ -4,6 +4,8 @@ name = TPtankCube125
 module = Part
 author = NecroBones
 
+FTPcolorSwitch = probe
+
 MODEL {
 	model = FuelTanksPlus/Probe/TPtankCube01250
 	scale = 1.0, 1.0, 1.0

diff --git a/GameData/NecroBones/FuelTanksPlus/Probe/TPtankTri.cfg b/GameData/NecroBones/FuelTanksPlus/Probe/TPtankTri.cfg
@@ -4,6 +4,8 @@ name = TPtankTri
 module = Part
 author = NecroBones
 
+FTPcolorSwitch = probe
+
 MODEL {
 	model = FuelTanksPlus/Probe/TPtankTri
 	scale = 1.0, 1.0, 1.0

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[TPtank0mL?????|TPcone0m*|TPdecoupler0m]:NEEDS[Firespitter|InterstellarFuelSwitch&!B9PartSwitch]:AFTER[FuelTanksPlus]
+@PART[TP*]:HAS[#FTPcolorSwitch[0m]]:NEEDS[Firespitter|InterstellarFuelSwitch&!B9PartSwitch]:AFTER[FuelTanksPlus]
 {
 	MODULE
 	{
@@ -10,9 +10,10 @@
 		buttonName = Next Color Scheme
 		previousButtonName = Previous Color Scheme
 	}
+	!FTPcolorSwitch = delete
 }
 
-@PART[TPtank0mL?????|TPcone0m*|TPdecoupler0m]:NEEDS[B9PartSwitch]:AFTER[FuelTanksPlus]
+@PART[TP*]:HAS[#FTPcolorSwitch[0m]]:NEEDS[B9PartSwitch]:AFTER[FuelTanksPlus]
 {
 	MODULE
 	{
@@ -47,4 +48,5 @@
 			transform = TPtank0m-Red
 		}
 	}
+	!FTPcolorSwitch = delete
 }
diff --git a/GameData/NecroBones/FuelTanksPlus/Size0/TPcone0m1.cfg b/GameData/NecroBones/FuelTanksPlus/Size0/TPcone0m1.cfg
@@ -4,6 +4,8 @@ name = TPcone0m1
 module = Part
 author = NecroBones
 
+FTPcolorSwitch = 0m
+
 MODEL {
 	model = FuelTanksPlus/Size0/TPcone0m1
 	scale = 1.0, 1.0, 1.0

diff --git a/GameData/NecroBones/FuelTanksPlus/Size0/TPdecoupler0m.cfg b/GameData/NecroBones/FuelTanksPlus/Size0/TPdecoupler0m.cfg
@@ -5,6 +5,8 @@ name = TPdecoupler0m
 module = Part
 author = NecroBones
 
+FTPcolorSwitch = 0m
+
 // --- asset parameters ---
 MODEL {
 	model = FuelTanksPlus/Size0/TPdecoupler0m

diff --git a/GameData/NecroBones/FuelTanksPlus/Size0/TPtank0mL00175.cfg b/GameData/NecroBones/FuelTanksPlus/Size0/TPtank0mL00175.cfg
@@ -4,6 +4,8 @@ name = TPtank0mL00175
 module = Part
 author = NecroBones
 
+FTPcolorSwitch = 0m
+
 MODEL {
 	model = FuelTanksPlus/Size0/TPtank0mL00175
 	scale = 1.0, 1.0, 1.0

diff --git a/GameData/NecroBones/FuelTanksPlus/Size0/TPtank0mL00700.cfg b/GameData/NecroBones/FuelTanksPlus/Size0/TPtank0mL00700.cfg
@@ -4,6 +4,8 @@ name = TPtank0mL00700
 module = Part
 author = NecroBones
 
+FTPcolorSwitch = 0m
+
 MODEL {
 	model = FuelTanksPlus/Size0/TPtank0mL00700
 	scale = 1.0, 1.0, 1.0

diff --git a/GameData/NecroBones/FuelTanksPlus/Size0/TPtank0mL01350.cfg b/GameData/NecroBones/FuelTanksPlus/Size0/TPtank0mL01350.cfg
@@ -4,6 +4,8 @@ name = TPtank0mL01350
 module = Part
 author = NecroBones
 
+FTPcolorSwitch = 0m
+
 MODEL {
 	model = FuelTanksPlus/Size0/TPtank0mL01350
 	scale = 1.0, 1.0, 1.0

diff --git a/GameData/NecroBones/FuelTanksPlus/Size0/TPtank0mL01875.cfg b/GameData/NecroBones/FuelTanksPlus/Size0/TPtank0mL01875.cfg
@@ -4,6 +4,8 @@ name = TPtank0mL01875
 module = Part
 author = NecroBones
 
+FTPcolorSwitch = 0m
+
 MODEL {
 	model = FuelTanksPlus/Size0/TPtank0mL01875
 	scale = 1.0, 1.0, 1.0

diff --git a/GameData/NecroBones/FuelTanksPlus/Size1/000_TPtank1m_MM.cfg b/GameData/NecroBones/FuelTanksPlus/Size1/000_TPtank1m_MM.cfg
@@ -1,4 +1,4 @@
-@PART[TPcone1m1|TPcone1m2|TPdome1m*|TPtank1mL?????|TPtank1m0mA|TPdecoupler1m]:NEEDS[Firespitter|InterstellarFuelSwitch&!B9PartSwitch]:AFTER[FuelTanksPlus]
+@PART[TP*]:HAS[#FTPcolorSwitch[1m]]:NEEDS[Firespitter|InterstellarFuelSwitch&!B9PartSwitch]:AFTER[FuelTanksPlus]
 {
 	MODULE
 	{
@@ -10,9 +10,10 @@
 		buttonName = Next Color Scheme
 		previousButtonName = Previous Color Scheme
 	}
+	!FTPcolorSwitch = delete
 }
 
-@PART[TPcone1m1|TPcone1m2|TPdome1m*|TPtank1mL?????|TPtank1m0mA|TPdecoupler1m]:NEEDS[B9PartSwitch]:AFTER[FuelTanksPlus]
+@PART[TP*]:HAS[#FTPcolorSwitch[1m]]:NEEDS[B9PartSwitch]:AFTER[FuelTanksPlus]
 {
 	MODULE
 	{
@@ -47,4 +48,5 @@
 			transform = TPtank1m-Blue
 		}
 	}
+	!FTPcolorSwitch = delete
 }
diff --git a/GameData/NecroBones/FuelTanksPlus/Size1/TPcone1m1.cfg b/GameData/NecroBones/FuelTanksPlus/Size1/TPcone1m1.cfg
@@ -6,6 +6,8 @@ name = TPcone1m1
 module = Part
 author = NecroBones
 
+FTPcolorSwitch = 1m
+
 // --- asset parameters ---
 
 MODEL {

diff --git a/GameData/NecroBones/FuelTanksPlus/Size1/TPcone1m2.cfg b/GameData/NecroBones/FuelTanksPlus/Size1/TPcone1m2.cfg
@@ -6,6 +6,8 @@ name = TPcone1m2
 module = Part
 author = NecroBones
 
+FTPcolorSwitch = 1m
+
 // --- asset parameters ---
 
 MODEL {

diff --git a/GameData/NecroBones/FuelTanksPlus/Size1/TPdecoupler1m.cfg b/GameData/NecroBones/FuelTanksPlus/Size1/TPdecoupler1m.cfg
@@ -5,6 +5,8 @@ name = TPdecoupler1m
 module = Part
 author = NecroBones
 
+FTPcolorSwitch = 1m
+
 // --- asset parameters ---
 MODEL {
 	model = FuelTanksPlus/Size1/TPdecoupler1m

diff --git a/GameData/NecroBones/FuelTanksPlus/Size1/TPdome1m1.cfg b/GameData/NecroBones/FuelTanksPlus/Size1/TPdome1m1.cfg
@@ -6,6 +6,8 @@ name = TPdome1m1
 module = Part
 author = NecroBones
 
+FTPcolorSwitch = 1m
+
 // --- asset parameters ---
 
 MODEL {

diff --git a/GameData/NecroBones/FuelTanksPlus/Size1/TPtank1m0mA.cfg b/GameData/NecroBones/FuelTanksPlus/Size1/TPtank1m0mA.cfg
@@ -4,6 +4,8 @@ name = TPtank1m0mA
 module = Part
 author = NecroBones
 
+FTPcolorSwitch = 1m
+
 MODEL {
 	model = FuelTanksPlus/Size1/TPtank1m0mA
 	texture = orange-jumbo-0, Squad/Parts/FuelTank/fuelTankJumbo-64/model000

diff --git a/GameData/NecroBones/FuelTanksPlus/Size1/TPtank1mL00313.cfg b/GameData/NecroBones/FuelTanksPlus/Size1/TPtank1mL00313.cfg
@@ -4,6 +4,8 @@ name = TPtank1mL00313
 module = Part
 author = NecroBones
 
+FTPcolorSwitch = 1m
+
 MODEL {
 	model = FuelTanksPlus/Size1/TPtank1mL00313
 	scale = 1.0, 1.0, 1.0

diff --git a/GameData/NecroBones/FuelTanksPlus/Size1/TPtank1mL05625.cfg b/GameData/NecroBones/FuelTanksPlus/Size1/TPtank1mL05625.cfg
@@ -4,6 +4,8 @@ name = TPtank1mL05625
 module = Part
 author = NecroBones
 
+FTPcolorSwitch = 1m
+
 MODEL {
 	model = FuelTanksPlus/Size1/TPtank1mL05625
 	scale = 1.0, 1.0, 1.0

diff --git a/GameData/NecroBones/FuelTanksPlus/Size2/000_TPtank2m_MM.cfg b/GameData/NecroBones/FuelTanksPlus/Size2/000_TPtank2m_MM.cfg
@@ -1,4 +1,4 @@
-@PART[TPcone2m|TPdome2m|TPtank2mL?????|TPtank2m1mA|TPdecoupler2m]:NEEDS[Firespitter|InterstellarFuelSwitch&!B9PartSwitch]:AFTER[FuelTanksPlus]
+@PART[TP*]:HAS[#FTPcolorSwitch[2m]]:NEEDS[Firespitter|InterstellarFuelSwitch&!B9PartSwitch]:AFTER[FuelTanksPlus]
 {
 	MODULE
 	{
@@ -10,9 +10,10 @@
 		buttonName = Next Color Scheme
 		previousButtonName = Previous Color Scheme
 	}
+	!FTPcolorSwitch = delete
 }
 
-@PART[TPcone2m|TPdome2m|TPtank2mL?????|TPtank2m1mA|TPdecoupler2m]:NEEDS[B9PartSwitch]:AFTER[FuelTanksPlus]
+@PART[TP*]:HAS[#FTPcolorSwitch[2m]]:NEEDS[B9PartSwitch]:AFTER[FuelTanksPlus]
 {
 	MODULE
 	{
@@ -53,4 +54,5 @@
 			transform = TPtank2m-Red
 		}
 	}
+	!FTPcolorSwitch = delete
 }
diff --git a/GameData/NecroBones/FuelTanksPlus/Size2/TPcone2m.cfg b/GameData/NecroBones/FuelTanksPlus/Size2/TPcone2m.cfg
@@ -6,6 +6,8 @@ name = TPcone2m
 module = Part
 author = NecroBones
 
+FTPcolorSwitch = 2m
+
 // --- asset parameters ---
 
 MODEL {

diff --git a/GameData/NecroBones/FuelTanksPlus/Size2/TPdecoupler2m.cfg b/GameData/NecroBones/FuelTanksPlus/Size2/TPdecoupler2m.cfg
@@ -5,6 +5,8 @@ name = TPdecoupler2m
 module = Part
 author = NecroBones
 
+FTPcolorSwitch = 2m
+
 // --- asset parameters ---
 MODEL {
 	model = FuelTanksPlus/Size2/TPdecoupler2m

diff --git a/GameData/NecroBones/FuelTanksPlus/Size2/TPdome2m.cfg b/GameData/NecroBones/FuelTanksPlus/Size2/TPdome2m.cfg
@@ -6,6 +6,8 @@ name = TPdome2m
 module = Part
 author = NecroBones
 
+FTPcolorSwitch = 2m
+
 // --- asset parameters ---
 
 MODEL {

diff --git a/GameData/NecroBones/FuelTanksPlus/Size2/TPtank2m1mA.cfg b/GameData/NecroBones/FuelTanksPlus/Size2/TPtank2m1mA.cfg
@@ -4,6 +4,8 @@ name = TPtank2m1mA
 module = Part
 author = NecroBones
 
+FTPcolorSwitch = 2m
+
 MODEL {
 	model = FuelTanksPlus/Size2/TPtank2m1mA
 	texture = orange-jumbo-0, Squad/Parts/FuelTank/fuelTankJumbo-64/model000

diff --git a/GameData/NecroBones/FuelTanksPlus/Size2/TPtank2mL00469.cfg b/GameData/NecroBones/FuelTanksPlus/Size2/TPtank2mL00469.cfg
@@ -4,6 +4,8 @@ name = TPtank2mL00469
 module = Part
 author = NecroBones
 
+FTPcolorSwitch = 2m
+
 MODEL {
 	model = FuelTanksPlus/Size2/TPtank2mL00469
 	scale = 1.0, 1.0, 1.0

diff --git a/GameData/NecroBones/FuelTanksPlus/Size2/TPtank2mL05625.cfg b/GameData/NecroBones/FuelTanksPlus/Size2/TPtank2mL05625.cfg
@@ -4,6 +4,8 @@ name = TPtank2mL05625
 module = Part
 author = NecroBones
 
+FTPcolorSwitch = 2m
+
 MODEL {
 	model = FuelTanksPlus/Size2/TPtank2mL05625
 	texture = orange-jumbo-0, Squad/Parts/FuelTank/fuelTankJumbo-64/model000

diff --git a/GameData/NecroBones/FuelTanksPlus/Size2/TPtank2mL11250.cfg b/GameData/NecroBones/FuelTanksPlus/Size2/TPtank2mL11250.cfg
@@ -4,6 +4,8 @@ name = TPtank2mL11250
 module = Part
 author = NecroBones
 
+FTPcolorSwitch = 2m
+
 MODEL {
 	model = FuelTanksPlus/Size2/TPtank2mL11250
 	texture = orange-jumbo-0, Squad/Parts/FuelTank/fuelTankJumbo-64/model000

diff --git a/GameData/NecroBones/FuelTanksPlus/Size2/TPtank2mL15000.cfg b/GameData/NecroBones/FuelTanksPlus/Size2/TPtank2mL15000.cfg
@@ -4,6 +4,8 @@ name = TPtank2mL15000
 module = Part
 author = NecroBones
 
+FTPcolorSwitch = 2m
+
 MODEL {
 	model = FuelTanksPlus/Size2/TPtank2mL15000
 	texture = orange-jumbo-0, Squad/Parts/FuelTank/fuelTankJumbo-64/model000

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[TPcone3m|TPdome3m|TPtank3mL?????|TPtank3m2mA*|TPdecoupler3m]:NEEDS[Firespitter|InterstellarFuelSwitch&!B9PartSwitch]:AFTER[FuelTanksPlus]
+@PART[TP*]:HAS[#FTPcolorSwitch[3m]]:NEEDS[Firespitter|InterstellarFuelSwitch&!B9PartSwitch]:AFTER[FuelTanksPlus]
 {
 	MODULE
 	{
@@ -10,9 +10,10 @@
 		buttonName = Next Color Scheme
 		previousButtonName = Previous Color Scheme
 	}
+	!FTPcolorSwitch = delete
 }
 
-@PART[TPcone3m|TPdome3m|TPtank3mL?????|TPtank3m2mA*|TPdecoupler3m]:NEEDS[B9PartSwitch]:AFTER[FuelTanksPlus]
+@PART[TP*]:HAS[#FTPcolorSwitch[3m]]:NEEDS[B9PartSwitch]:AFTER[FuelTanksPlus]
 {
 	MODULE
 	{
@@ -54,5 +55,6 @@
 			transform = TPtank3m-Tan
 		}
 	}
+	!FTPcolorSwitch = delete
 }
 
diff --git a/GameData/NecroBones/FuelTanksPlus/Size3/TPcone3m.cfg b/GameData/NecroBones/FuelTanksPlus/Size3/TPcone3m.cfg
@@ -6,6 +6,8 @@ name = TPcone3m
 module = Part
 author = NecroBones
 
+FTPcolorSwitch = 3m
+
 // --- asset parameters ---
 
 MODEL {

diff --git a/GameData/NecroBones/FuelTanksPlus/Size3/TPdecoupler3m.cfg b/GameData/NecroBones/FuelTanksPlus/Size3/TPdecoupler3m.cfg
@@ -5,6 +5,8 @@ name = TPdecoupler3m
 module = Part
 author = NecroBones
 
+FTPcolorSwitch = 3m
+
 // --- asset parameters ---
 MODEL {
 	model = FuelTanksPlus/Size3/TPdecoupler3m

diff --git a/GameData/NecroBones/FuelTanksPlus/Size3/TPdome3m.cfg b/GameData/NecroBones/FuelTanksPlus/Size3/TPdome3m.cfg
@@ -6,6 +6,8 @@ name = TPdome3m
 module = Part
 author = NecroBones
 
+FTPcolorSwitch = 3m
+
 // --- asset parameters ---
 
 MODEL {