Merge pull request #127 from zer0Kerbal/2.0.0.0

2.0.0.0 (2018-03-12) - Overhaul for 1.4
zer0Kerbal · Apr 12, 2022 · 3de7bde · 3de7bde
2 parents 14976aa + 654017f
commit 3de7bde
Show file tree

Hide file tree

Showing 85 changed files with 5,801 additions and 693 deletions.
diff --git a/FuelTanksPlus.version b/FuelTanksPlus.version
@@ -11,15 +11,15 @@
 	},
 	"VERSION" :
 	{
-		"MAJOR" : 1,
-		"MINOR" : 12,
-		"PATCH" : 1,
+		"MAJOR" : 2,
+		"MINOR" : 0,
+		"PATCH" : 0,
 		"BUILD" : 0
 	},
 	"KSP_VERSION" :
 	{
 		"MAJOR" : 1,
-		"MINOR" : 3,
+		"MINOR" : 4,
 		"PATCH" : 0
 	},
 	"KSP_VERSION_MIN" :

diff --git a/GameData/NecroBones/FuelTanksPlus/FuelTanksPlus-CHANGELOG.txt b/GameData/NecroBones/FuelTanksPlus/FuelTanksPlus-CHANGELOG.txt
@@ -1,3 +1,7 @@
+2.0 (2018-03-12) - Overhaul for 1.4
+ - Altered color/mesh switching to use new 1.4 stock switcher (except the radial tanks).
+ - Note: Saved colors in existing vessels may need to be manually updated or relaunched to correct.
+
 1.12.1 (2017-04-09) - MFT fix.
  - Corrected some MM patch issues for ModularFuelTanks.
 

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

diff --git a/GameData/NecroBones/FuelTanksPlus/Patches/FuelTanksPlus_Themes.cfg b/GameData/NecroBones/FuelTanksPlus/Patches/FuelTanksPlus_Themes.cfg
@@ -0,0 +1,64 @@
+VARIANTTHEME
+{
+	name = FTPTitan
+	displayName = Titan
+	description = Titanic Rocketry!
+	primaryColor = #777777
+	secondaryColor = #222222
+}
+VARIANTTHEME
+{
+	name = FTPTitan2
+	displayName = Titan Red
+	description = Seeing Red!
+	primaryColor = #777777
+	secondaryColor = #872828
+}
+VARIANTTHEME
+{
+	name = Black
+	displayName = Black
+	description = Black as night.
+	primaryColor = #000000
+	secondaryColor = #000000
+}
+VARIANTTHEME
+{
+	name = FTPAriane
+	displayName = Ariane
+	description = Ariane V inspired.
+	primaryColor = #aea794
+	secondaryColor = #9f9988
+}
+VARIANTTHEME
+{
+	name = FTPSoyuz
+	displayName = Soyuz
+	description = Soyuz inspired.
+	primaryColor = #505b52
+	secondaryColor = #aa7639
+}
+VARIANTTHEME
+{
+	name = FTPDelta2
+	displayName = Delta2
+	description = Delta bluish coloration.
+	primaryColor = #326264
+	secondaryColor = #295557
+}
+VARIANTTHEME
+{
+	name = FTPAtlas
+	displayName = Atlas
+	description = Atlas V inspired.
+	primaryColor = #6d2f1e
+	secondaryColor = #56251d
+}
+VARIANTTHEME
+{
+	name = FTPBlue
+	displayName = Blue
+	description = Feeling Blue!
+	primaryColor = #364876
+	secondaryColor = #222d4b
+}
diff --git a/GameData/NecroBones/FuelTanksPlus/Probe/000_TPtankP_MM.cfg b/GameData/NecroBones/FuelTanksPlus/Probe/000_TPtankP_MM.cfg
@@ -1,37 +0,0 @@
-@PART[TP*]:HAS[#FTPcolorSwitch[probe]]:NEEDS[Firespitter|InterstellarFuelSwitch]:AFTER[FuelTanksPlus]
-{
-	MODULE
-	{
-		name:NEEDS[!InterstellarFuelSwitch] = FSmeshSwitch
-		name:NEEDS[InterstellarFuelSwitch] = InterstellarMeshSwitch
-		objects = TPprobe-Gold;TPprobe-Silver
-		objectDisplayNames = Gold;Silver
-		affectColliders = false
-		buttonName = Next Color Scheme
-		previousButtonName = Previous Color Scheme
-	}
-	!FTPcolorSwitch = delete
-}
-
-@PART[TP*]:HAS[#FTPcolorSwitch[probe]]:NEEDS[B9PartSwitch&!Firespitter&!InterstellarFuelSwitch]:AFTER[FuelTanksPlus]
-{
-	MODULE
-	{
-		name = ModuleB9PartSwitch
-		moduleID = meshSwitch
-		switcherDescription = Color Scheme
-		affectDragCubes = false
-
-		SUBTYPE
-		{
-			name = Gold
-			transform = TPprobe-Gold
-		}
-		SUBTYPE
-		{
-			name = Silver
-			transform = TPprobe-Silver
-		}
-	}
-	!FTPcolorSwitch = delete
-}

diff --git a/GameData/NecroBones/FuelTanksPlus/Probe/000_TPtankP_MM.txt b/GameData/NecroBones/FuelTanksPlus/Probe/000_TPtankP_MM.txt
@@ -0,0 +1,37 @@
+@PART[TP*]:HAS[#FTPcolorSwitch[probe]]:NEEDS[Firespitter|InterstellarFuelSwitch]:AFTER[FuelTanksPlus]
+{
+	MODULE
+	{
+		name:NEEDS[!InterstellarFuelSwitch] = FSmeshSwitch
+		name:NEEDS[InterstellarFuelSwitch] = InterstellarMeshSwitch
+		objects = TPprobe-Gold;TPprobe-Silver
+		objectDisplayNames = Gold;Silver
+		affectColliders = false
+		buttonName = Next Color Scheme
+		previousButtonName = Previous Color Scheme
+	}
+	!FTPcolorSwitch = delete
+}
+
+@PART[TP*]:HAS[#FTPcolorSwitch[probe]]:NEEDS[B9PartSwitch&!Firespitter&!InterstellarFuelSwitch]:AFTER[FuelTanksPlus]
+{
+	MODULE
+	{
+		name = ModuleB9PartSwitch
+		moduleID = meshSwitch
+		switcherDescription = Color Scheme
+		affectDragCubes = false
+
+		SUBTYPE
+		{
+			name = Gold
+			transform = TPprobe-Gold
+		}
+		SUBTYPE
+		{
+			name = Silver
+			transform = TPprobe-Silver
+		}
+	}
+	!FTPcolorSwitch = delete
+}
diff --git a/GameData/NecroBones/FuelTanksPlus/Probe/TPtankCube00500.cfg b/GameData/NecroBones/FuelTanksPlus/Probe/TPtankCube00500.cfg
@@ -55,5 +55,35 @@ RESOURCE
  maxAmount = 3.3
 }
 
-
+	MODULE
+	{
+		name = ModulePartVariants
+		baseVariant = Gold
+		VARIANT
+		{
+			name = Gold
+			displayName = Gold
+			themeName = Gold
+			primaryColor = #fccb0a
+			secondaryColor = #fccb0a
+			GAMEOBJECTS
+			{
+				TPprobe-Gold = true
+				TPprobe-Silver = false
+			}
+		}
+		VARIANT
+		{
+			name = Silver
+			displayName = Silver
+			themeName = Gray
+			primaryColor = #999999
+			secondaryColor = #999999
+			GAMEOBJECTS
+			{
+				TPprobe-Gold = false
+				TPprobe-Silver = true
+			}
+		}
+	}
 }
diff --git a/GameData/NecroBones/FuelTanksPlus/Probe/TPtankCube00500.mu b/GameData/NecroBones/FuelTanksPlus/Probe/TPtankCube00500.mu
diff --git a/GameData/NecroBones/FuelTanksPlus/Probe/TPtankCube00750.cfg b/GameData/NecroBones/FuelTanksPlus/Probe/TPtankCube00750.cfg
@@ -55,6 +55,36 @@ RESOURCE
  amount = 9.9
  maxAmount = 9.9
 }
-
+	MODULE
+	{
+		name = ModulePartVariants
+		baseVariant = Gold
+		VARIANT
+		{
+			name = Gold
+			displayName = Gold
+			themeName = Gold
+			primaryColor = #fccb0a
+			secondaryColor = #fccb0a
+			GAMEOBJECTS
+			{
+				TPprobe-Gold = true
+				TPprobe-Silver = false
+			}
+		}
+		VARIANT
+		{
+			name = Silver
+			displayName = Silver
+			themeName = Gray
+			primaryColor = #999999
+			secondaryColor = #999999
+			GAMEOBJECTS
+			{
+				TPprobe-Gold = false
+				TPprobe-Silver = true
+			}
+		}
+	}
 
 }
diff --git a/GameData/NecroBones/FuelTanksPlus/Probe/TPtankCube00750.mu b/GameData/NecroBones/FuelTanksPlus/Probe/TPtankCube00750.mu
diff --git a/GameData/NecroBones/FuelTanksPlus/Probe/TPtankCube01250.cfg b/GameData/NecroBones/FuelTanksPlus/Probe/TPtankCube01250.cfg
@@ -55,6 +55,36 @@ RESOURCE
  amount = 44
  maxAmount = 44
 }
-
+	MODULE
+	{
+		name = ModulePartVariants
+		baseVariant = Gold
+		VARIANT
+		{
+			name = Gold
+			displayName = Gold
+			themeName = Gold
+			primaryColor = #fccb0a
+			secondaryColor = #fccb0a
+			GAMEOBJECTS
+			{
+				TPprobe-Gold = true
+				TPprobe-Silver = false
+			}
+		}
+		VARIANT
+		{
+			name = Silver
+			displayName = Silver
+			themeName = Gray
+			primaryColor = #999999
+			secondaryColor = #999999
+			GAMEOBJECTS
+			{
+				TPprobe-Gold = false
+				TPprobe-Silver = true
+			}
+		}
+	}
 
 }
diff --git a/GameData/NecroBones/FuelTanksPlus/Probe/TPtankCube01250.mu b/GameData/NecroBones/FuelTanksPlus/Probe/TPtankCube01250.mu
diff --git a/GameData/NecroBones/FuelTanksPlus/Probe/TPtankTri.cfg b/GameData/NecroBones/FuelTanksPlus/Probe/TPtankTri.cfg
@@ -62,5 +62,35 @@ RESOURCE
  maxAmount = 27.5
 }
 
-
+	MODULE
+	{
+		name = ModulePartVariants
+		baseVariant = Gold
+		VARIANT
+		{
+			name = Gold
+			displayName = Gold
+			themeName = Gold
+			primaryColor = #fccb0a
+			secondaryColor = #fccb0a
+			GAMEOBJECTS
+			{
+				TPprobe-Gold = true
+				TPprobe-Silver = false
+			}
+		}
+		VARIANT
+		{
+			name = Silver
+			displayName = Silver
+			themeName = Gray
+			primaryColor = #999999
+			secondaryColor = #999999
+			GAMEOBJECTS
+			{
+				TPprobe-Gold = false
+				TPprobe-Silver = true
+			}
+		}
+	}
 }
diff --git a/GameData/NecroBones/FuelTanksPlus/Probe/TPtankTri.mu b/GameData/NecroBones/FuelTanksPlus/Probe/TPtankTri.mu
diff --git a/GameData/NecroBones/FuelTanksPlus/Radial/TPtankR03.cfg b/GameData/NecroBones/FuelTanksPlus/Radial/TPtankR03.cfg
@@ -62,4 +62,6 @@ RESOURCE
 		toggleEditor = true
 		toggleFlight = true
 	}
+
+
 }