Functional variants

Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-0625.cfg

@@ -0,0 +1,15 @@
+// Patches applying art changes to 0.625m aerodynamic parts
+// Contents:
+// - Small Nose Cone (standardNoseCone)
+
+@PART[standardNoseCone]
+{
+  @author = Chris Adderley (Nertea)
+
+  !mesh = DELETE
+  !MODEL {}
+  MODEL {
+    model = ReStock/Assets/Aero/restock-nosecone-0625-1
+  }
+
+}

Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-125.cfg

@@ -17,8 +17,8 @@
   MODULE
   {
     name = ModulePartVariants
-    baseVariant = White
+    baseVariant = BlackAndWhite
-
+    VARIANT
     {
       name = BlackAndWhite
       displayName = #autoLOC_8007122
@@ -111,6 +111,7 @@
         125SharpConeOrange = false
       }
     }
+    VARIANT
     {
       name = BlackAndWhite
       displayName = #autoLOC_8007122
@@ -157,9 +158,10 @@
       }
     }
   }
+  !MODULE[ModuleAnimateHeat] {}
 }
 
-@PART[pointyNoseConeN]
+@PART[pointyNoseConeB]
 {
   @author = Chris Adderley (Nertea)
 
@@ -182,12 +184,13 @@
       secondaryColor = #ffffff
       GAMEOBJECTS
       {
-        125TiltConeDark = false
+        125mBentConeDark = false
-        125TiltConeWhite = true
+        125mBentConeWhite = true
-        125TiltConeBlackWhite = false
+        125mBentConeBlackandWhite = false
-        125TiltConeOrange = false
+        125mBentConeOrange = false
       }
     }
+    VARIANT
     {
       name = BlackAndWhite
       displayName = #autoLOC_8007122
@@ -196,10 +199,10 @@
       secondaryColor = #000000
       GAMEOBJECTS
       {
-        125TiltConeDark = false
+        125mBentConeDark = false
-        125TiltConeWhite = false
+        125mBentConeWhite = false
-        125TiltConeBlackWhite = true
+        125mBentConeBlackandWhite = true
-        125TiltConeOrange = false
+        125mBentConeOrange = false
       }
     }
     VARIANT
@@ -211,10 +214,10 @@
       secondaryColor = #f49841
       GAMEOBJECTS
       {
-        125TiltConeDark = false
+        125mBentConeDark = false
-        125TiltConeWhite = false
+        125mBentConeWhite = false
-        125TiltConeBlackWhite = false
+        125mBentConeBlackandWhite = false
-        125TiltConeOrange = true
+        125mBentConeOrange = true
       }
     }
     VARIANT
@@ -226,11 +229,12 @@
       secondaryColor = #4c4f47
       GAMEOBJECTS
       {
-        125TiltConeDark = true
+        125mBentConeDark = true
-        125TiltConeWhite = false
+        125mBentConeWhite = false
-        125TiltConeBlackWhite = false
+        125mBentConeBlackandWhite = false
-        125TiltConeOrange = false
+        125mBentConeOrange = false
       }
     }
   }
+  !MODULE[ModuleAnimateHeat] {}
 }

Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-25.cfg

@@ -17,7 +17,6 @@
     name = ModulePartVariants
     baseVariant = White
     VARIANT
-    VARIANT
     {
       name = White
       displayName = #autoLOC_8007119
@@ -31,6 +30,7 @@
         25mNoseconeOrange = false
       }
     }
+    VARIANT
     {
       name = BlackAndWhite
       displayName = #autoLOC_8007122

Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-lights.cfg

@@ -20,11 +20,9 @@
 	@MODULE[ModuleLight]
 	{
 		@animationName = RestockSpotLight_On
+		@lightName = Spot
 	}
-//	MODEL
+
-//	{
-//		model = Squad/Parts/Utility/spotLightMk1/model
-//	}
 }
 // Floodlight
 @PART[spotLight2]
@@ -42,5 +40,6 @@
   @MODULE[ModuleLight]
 	{
 		@animationName = RestockFloodLight_On
+		@lightName = Spot
 	}
 }

Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-0625.cfg

@@ -2,7 +2,7 @@
 // Contents:
 // - LV-1 "Ant" Liquid Fuel Engine (microEngine)
 // - LV-1R "Spider" Liquid Fuel Engine (radialEngineMini)
-// - 48-7S "Spark" Liquid Fuel Engine (liquidEngineMini)
+// - 48-7S "Spark" Liquid Fuel Engine (liquidEngineMini_v2)
 // - 24-77 "Twitch" Liquid Fuel Engine (smallRadialEngine)
 // - O-10 "Puff" MonoPropellant Fuel Engine (omsEngine)
 
@@ -350,7 +350,7 @@
 }
 
 // Spark
-@PART[liquidEngineMini]
+@PART[liquidEngineMini_v2]
 {
   @author = Chris Adderley (Nertea)
 
@@ -524,6 +524,7 @@
 	{
 		@gimbalTransformName = B_Gimbal
 	}
+  !MODULE[ModulePartVariants] {}
   MODULE
 	{
 		name = ModulePartVariants

Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-125.cfg

@@ -2,7 +2,7 @@
 // Contents:
 // - LV-N "Nerv" Atomic Rocket Motor (nuclearEngine)
 // - S3 KS-25 "Vector" Liquid Fuel Engine (SSME)
-// - LV-909 "Terrier" Liquid Fuel Engine (liquidEngine3)
+// - LV-909 "Terrier" Liquid Fuel Engine (liquidEngine3_v2)
 // - LV-T45 "Swivel" Liquid Fuel Engine (liquidEngine2)
 // - LV-T30 "Reliant" Liquid Fuel Engine (liquidEngine)
 
@@ -12,7 +12,7 @@
   @author = Chris Adderley (Nertea)
 
   !mesh = DELETE
-  !MODEL = {}
+  !MODEL {}
   MODEL {
     model = ReStock/Assets/Engine/restock-engine-nerv-1
   }
@@ -156,7 +156,7 @@
   @author = Chris Adderley (Nertea)
 
   !mesh = DELETE
-  !MODEL = {}
+  !MODEL {}
   MODEL {
     model = ReStock/Assets/Engine/restock-engine-vector-1
   }
@@ -433,18 +433,17 @@
 
 
 // Terrier
-@PART[liquidEngine3]
+@PART[liquidEngine3_v2]
 {
   @author = Porkjet and Chris Adderley (Nertea)
 
   !mesh = DELETE
-  !MODEL = {}
+  !MODEL {}
   MODEL {
     model = ReStock/Assets/Engine/restock-engine-terrier-1
   }
-  %rescaleFactor = 1
 
-  %node_attach = 0.0, 23.0, 0.0, 0.0, 1.0, 0.0, 1
+  node_attach = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 1
   @attachRules = 1,1,1,0,0
 
   !fx_exhaustFlame_blue = DELETE
@@ -521,8 +520,9 @@
   }
 
   @bulkheadProfiles = srf, size1
-  @node_stack_top = 0.0, 28.75, 0.0, 0.0, 1.0, 0.0, 1
+
-  @node_stack_bottom = 0.0, -47.281375, 0.0, 0.0, -1.0, 0.0, 1
+  !MODULE[ModulePartVariants] {}
+
   MODULE
 	{
 		name = ModulePartVariants

Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-25.cfg

@@ -26,31 +26,18 @@
     scale = 1,-1,1
     rotation = 0, 0, 0
   }
-  @MODULE[ModulePartVariants]
+  !MODULE[ModulePartVariants] {}
-  {
+  MODULE
-    baseVariant = White
+	{
-    !primaryColor = DELETE
+		name = ModulePartVariants
-    !secondaryColor = DELETE
+		baseVariant = BlackAndWhite
-    !baseDisplayName = DELETE
-    !baseThemeName = DELETE
-    @VARIANT[Orange]
-    {
-      !TEXTURE {}
-      !GAMEOBJECTS {}
-      GAMEOBJECTS
-      {
-    		25TankTinyGrey = false
-    		25TankTinyOrange = true
-    		25TankTinyWhite = false
-      }
-    }
     VARIANT
     {
-      name = White
+      name = BlackAndWhite
       displayName = #autoLOC_8007122
-			themeName = BlackAndWhite
+      themeName = White
-			primaryColor = #ffffff
+      primaryColor = #ffffff
-			secondaryColor = #000000
+      secondaryColor = #000000
       GAMEOBJECTS
       {
     	  25TankTinyGrey = false
@@ -58,6 +45,21 @@
     		25TankTinyWhite = true
       }
     }
+    VARIANT
+    {
+      name = Orange
+      displayName = #autoLOC_8007123
+      themeName = Orange
+      primaryColor = #f49841
+      secondaryColor = #4c4f47
+      GAMEOBJECTS
+      {
+    		25TankTinyGrey = false
+    		25TankTinyOrange = true
+    		25TankTinyWhite = false
+      }
+    }
+
     VARIANT
     {
       name = Metallic
@@ -97,31 +99,18 @@
     scale = 1,-1,1
     rotation = 0, 0, 0
   }
-  @MODULE[ModulePartVariants]
+  !MODULE[ModulePartVariants] {}
-  {
+  MODULE
-    baseVariant = White
+	{
-    !primaryColor = DELETE
+		name = ModulePartVariants
-    !secondaryColor = DELETE
+		baseVariant = BlackAndWhite
-    !baseDisplayName = DELETE
-    !baseThemeName = DELETE
-    @VARIANT[Orange]
-    {
-      !TEXTURE {}
-      !GAMEOBJECTS {}
-      GAMEOBJECTS
-      {
-    		25TankMedGrey = false
-    		25TankMedOrange = true
-    		25TankMedWhite = false
-      }
-    }
     VARIANT
     {
-      name = White
+      name = BlackAndWhite
-      displayName = #autoLOC_8007122
 			themeName = BlackAndWhite
-			primaryColor = #ffffff
+      primaryColor = #ffffff
-			secondaryColor = #000000
+  		secondaryColor = #000000
+  		displayName = #autoLOC_8007122
       GAMEOBJECTS
       {
     	  25TankMedGrey = false
@@ -129,6 +118,21 @@
     		25TankMedWhite = true
       }
     }
+    VARIANT
+    {
+      name = Orange
+      displayName = #autoLOC_8007123
+      themeName = Orange
+      primaryColor = #f49841
+      secondaryColor = #4c4f47
+      GAMEOBJECTS
+      {
+    		25TankMedGrey = false
+    		25TankMedOrange = true
+    		25TankMedWhite = false
+      }
+    }
+
     VARIANT
     {
       name = Metallic
@@ -167,31 +171,18 @@
     scale = 1,-1,1
     rotation = 0, 0, 0
   }
-  @MODULE[ModulePartVariants]
+  !MODULE[ModulePartVariants] {}
+  MODULE
   {
-    baseVariant = White
+    name = ModulePartVariants
-    !primaryColor = DELETE
+    baseVariant = BlackAndWhite
-		!secondaryColor = DELETE
-		!baseDisplayName = DELETE
-		!baseThemeName = DELETE
-    @VARIANT[Orange]
-    {
-      !TEXTURE {}
-      !GAMEOBJECTS {}
-      GAMEOBJECTS
-      {
-    		25TankSmallGrey = false
-		    25TankSmallOrange = true
-		    25TankSmallWhite = false
-      }
-    }
     VARIANT
     {
-      name = White
+      name = BlackAndWhite
       displayName = #autoLOC_8007122
 			themeName = BlackAndWhite
-			primaryColor = #ffffff
+      primaryColor = #ffffff
-			secondaryColor = #000000
+  		secondaryColor = #000000
       GAMEOBJECTS
       {
     	  25TankSmallGrey = false
@@ -199,6 +190,21 @@
     		25TankSmallWhite = true
       }
     }
+    VARIANT
+    {
+      name = Orange
+      displayName = #autoLOC_8007123
+      themeName = Orange
+      primaryColor = #f49841
+      secondaryColor = #4c4f47
+      GAMEOBJECTS
+      {
+    		25TankSmallGrey = false
+		    25TankSmallOrange = true
+		    25TankSmallWhite = false
+      }
+    }
+
     VARIANT
     {
       name = Metallic
@@ -237,10 +243,25 @@
     scale = 1,-1,1
     rotation = 0, 0, 0
   }
-  @MODULE[ModulePartVariants]
+  !MODULE[ModulePartVariants] {}
+  MODULE
   {
-    !VARIANT[White] {}
+    name = ModulePartVariants
-    !VARIANT[Orange] {}
+    baseVariant = BlackAndWhite
+    VARIANT
+    {
+      name = BlackAndWhite
+      displayName = #autoLOC_8007122
+      themeName = BlackAndWhite
+      primaryColor = #ffffff
+      secondaryColor = #000000
+      GAMEOBJECTS
+      {
+    		25TankLargeGrey = false
+    		25TankLargeOrange = false
+    		25TankLargeWhite = true
+      }
+    }
     VARIANT
     {
       name = Orange
@@ -255,20 +276,7 @@
         25TankLargeWhite = false
       }
     }
-    VARIANT
+
-    {
-      name = White
-      displayName = #autoLOC_8007122
-      themeName = BlackAndWhite
-      primaryColor = #ffffff
-      secondaryColor = #000000
-      GAMEOBJECTS
-      {
-    		25TankLargeGrey = false
-    		25TankLargeOrange = false
-    		25TankLargeWhite = true
-      }
-    }
 
 
     VARIANT

Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-25.cfg

@@ -35,9 +35,9 @@
     VARIANT
     {
       name = Orange
-      displayName = #autoLOC_8007117
+      displayName = #autoLOC_8007123
       themeName = Orange
-      primaryColor = #4c4f47
+      primaryColor = #f49841
       secondaryColor = #4c4f47
       GAMEOBJECTS
       {
@@ -80,9 +80,9 @@
     VARIANT
     {
       name = Orange
-      displayName = #autoLOC_8007117
+      displayName = #autoLOC_8007123
       themeName = Orange
-      primaryColor = #4c4f47
+      primaryColor = #f49841
       secondaryColor = #4c4f47
       GAMEOBJECTS
       {

Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-375.cfg

@@ -1,6 +1,6 @@
 // Patches applying art changes to 3.75m structural parts
 // Contents:
-// - Kerbodyne ADTP-2-3 (Size3to2Adapter)
+// - Kerbodyne ADTP-2-3 (Size3to2Adapter_v2)
 
 @PART[Size3To2Adapter_v2] {
   @author = Chris Adderley (Nertea)
@@ -8,8 +8,20 @@
   !mesh = DELETE
   !MODEL {}
   MODEL {
-    model = ReStock/Assets/FuelTank/restock-adapter-375-solid-1
+    model = ReStock/Assets/FuelTank/restock-adapter-375-fueled-1
   }
+  MODEL
+	{
+		model = ReStock/Assets/FuelTank/restock-endcap-fueltank-25-orange
+		scale = 1.0, 1.0, 1.0
+		position = 0.0, 1.148, 0.0
+	}
+	MODEL
+	{
+		model = ReStock/Assets/FuelTank/restock-endcap-fueltank-375-orange
+		scale = 1.0, -1.0, 1.0
+		position = 0.0, -1.098, 0.0
+	}
   %rescaleFactor = 1
   !MODULE[ModulePartVariants] {}
   MODULE
@@ -48,9 +60,9 @@
     VARIANT
     {
       name = Orange
-      displayName = #autoLOC_8007121
+      displayName = #autoLOC_8007123
       themeName = Orange
-      primaryColor = #4c4f47
+      primaryColor = #f49841
       secondaryColor = #f49841
       GAMEOBJECTS
       {