Merge pull request #49 from PorktoberRevolution/master

Merge master updates into heat bays

Distribution/Restock/GameData/ReStock/Localization/en-us.cfg

@@ -16,6 +16,9 @@ Localization
     #LOC_Restock_variant-engine_radial = Radial
     #LOC_Restock_variant-engine_boattail = Boattail
 
+    #LOC_Restock_variant-mounting_truss = Truss
+    #LOC_Restock_variant-mounting_compact = Compact
+
     #LOC_Restock_variant-surface_metal = Metal
 
     #LOC_Restock_variant-service-bay-opaque = Solid Caps

Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-docking.cfg

@@ -1,7 +1,60 @@
 // Patches applying art changes to crewed utility/science parts
 // Contents:
 // - Inline Clamp-O-Tron (dockingPortLateral)
+// - Clamp-O-Tron Jr. Docking Port (dockingPort3)
 // - Clamp-O-Tron Docking Port (dockingPort2)
+// - Clamp-O-Tron Sr. Docking Port (dockingPortLarge)
+// - Clamp-O-Tron Shielded Docking Port (dockingPort1)
+
+// Clamp-O-Tron Jr
+@PART[dockingPort3] {
+  @author = Chris Adderley (Nertea)
+
+  !mesh = DELETE
+  !MODEL {}
+  MODEL {
+    model = ReStock/Assets/Coupling/restock-docking-0625
+  }
+
+  %rescaleFactor = 1
+  MODULE
+	{
+		name = ModuleColorChanger
+		shaderProperty = _EmissiveColor
+		animRate = 0.8
+		animState = false
+		useRate = true
+		toggleInEditor = true
+		toggleInFlight = true
+		toggleInFlight = true
+		unfocusedRange = 5
+		toggleName = #autoLOC_502011 //#autoLOC_502011 = Toggle Lights
+		eventOnName = #autoLOC_502012 //#autoLOC_502012 = Lights On
+		eventOffName = #autoLOC_502013 //#autoLOC_502013 = Lights Off
+		toggleAction = True
+		defaultActionGroup = Light
+		redCurve
+		{
+			key = 0 0 0 3
+			key = 1 1 0 0
+		}
+		greenCurve
+		{
+			key = 0 0 0 1
+			key = 1 1 1 0
+		}
+		blueCurve
+		{
+			key = 0 0 0 0
+			key = 1 0.7 1.5 0
+		}
+		alphaCurve
+		{
+			key = 0 1
+		}
+	}
+ }
+
 
 // Inline Clamp-O-Tron
 @PART[dockingPortLateral] {
@@ -17,7 +70,8 @@
   %rescaleFactor = 1
   %manufacturer = #autoLOC_501624
 }
-// Inline Clamp-O-Tron
+
+// Clamp-O-Tron
 @PART[dockingPort2] {
   @author = Chris Adderley (Nertea)
 
@@ -65,3 +119,207 @@
 		}
 	}
  }
+
+// Clamp-O-Tron Shielded
+@PART[dockingPort1] {
+  @author = Chris Adderley (Nertea)
+
+  !mesh = DELETE
+  !MODEL {}
+  MODEL {
+    model = ReStock/Assets/Coupling/restock-docking-shielded-125-1
+  }
+
+  %rescaleFactor = 1
+
+  @MODULE[ModuleAnimateGeneric]
+	{
+		@animationName = PortExtend
+
+	}
+  MODULE
+	{
+		name = ModuleColorChanger
+		shaderProperty = _EmissiveColor
+		animRate = 0.8
+		animState = false
+		useRate = true
+		toggleInEditor = true
+		toggleInFlight = true
+		toggleInFlight = true
+		unfocusedRange = 5
+		toggleName = #autoLOC_502011 //#autoLOC_502011 = Toggle Lights
+		eventOnName = #autoLOC_502012 //#autoLOC_502012 = Lights On
+		eventOffName = #autoLOC_502013 //#autoLOC_502013 = Lights Off
+		toggleAction = True
+		defaultActionGroup = Light
+		redCurve
+		{
+			key = 0 0 0 3
+			key = 1 1 0 0
+		}
+		greenCurve
+		{
+			key = 0 0 0 1
+			key = 1 1 1 0
+		}
+		blueCurve
+		{
+			key = 0 0 0 0
+			key = 1 0.7 1.5 0
+		}
+		alphaCurve
+		{
+			key = 0 1
+		}
+	}
+	MODULE
+	{
+		name = FXModuleLookAtConstraint
+		// Ring
+		CONSTRAINLOOKFX
+		{
+			targetName = DockingCylBottom01
+			rotatorsName = DockingCylTop01
+		}
+		CONSTRAINLOOKFX
+		{
+			targetName = DockingCylBottom02
+			rotatorsName = DockingCylTop02
+		}
+		CONSTRAINLOOKFX
+		{
+			targetName = DockingCylBottom03
+			rotatorsName = DockingCylTop03
+		}
+		CONSTRAINLOOKFX
+		{
+			targetName = DockingCylBottom04
+			rotatorsName = DockingCylTop04
+		}
+		CONSTRAINLOOKFX
+		{
+			targetName = DockingCylBottom05
+			rotatorsName = DockingCylTop05
+		}
+		CONSTRAINLOOKFX
+		{
+			targetName = DockingCylBottom06
+			rotatorsName = DockingCylTop06
+		}
+
+		CONSTRAINLOOKFX
+		{
+			targetName = DockingCylTop01
+			rotatorsName = DockingCylBottom01
+		}
+		CONSTRAINLOOKFX
+		{
+			targetName = DockingCylTop02
+			rotatorsName = DockingCylBottom02
+		}
+		CONSTRAINLOOKFX
+		{
+			targetName = DockingCylTop03
+			rotatorsName = DockingCylBottom03
+		}
+		CONSTRAINLOOKFX
+		{
+			targetName = DockingCylTop04
+			rotatorsName = DockingCylBottom04
+		}
+		CONSTRAINLOOKFX
+		{
+			targetName = DockingCylTop05
+			rotatorsName = DockingCylBottom05
+		}
+		CONSTRAINLOOKFX
+		{
+			targetName = DockingCylTop06
+			rotatorsName = DockingCylBottom06
+		}
+
+		// Doors
+		CONSTRAINLOOKFX
+		{
+			targetName = ShldCylBottom01
+			rotatorsName = ShldCylTop01
+		}
+		CONSTRAINLOOKFX
+		{
+			targetName = ShldCylTop01
+			rotatorsName = ShldCylBottom01
+		}
+		CONSTRAINLOOKFX
+		{
+			targetName = ShldCylBottom02
+			rotatorsName = ShldCylTop02
+		}
+		CONSTRAINLOOKFX
+		{
+			targetName = ShldCylTop02
+			rotatorsName = ShldCylBottom02
+		}
+		CONSTRAINLOOKFX
+		{
+			targetName = ShldCylBottom03
+			rotatorsName = ShldCylTop03
+		}
+		CONSTRAINLOOKFX
+		{
+			targetName = ShldCylTop03
+			rotatorsName = ShldCylBottom03
+		}
+
+  }
+ }
+
+
+// Clamp-O-Tron Sr
+@PART[dockingPortLarge] {
+  @author = Chris Adderley (Nertea)
+
+  !mesh = DELETE
+  !MODEL {}
+  MODEL {
+    model = ReStock/Assets/Coupling/restock-docking-25-1
+  }
+
+  %rescaleFactor = 1
+  MODULE
+	{
+		name = ModuleColorChanger
+		shaderProperty = _EmissiveColor
+		animRate = 0.8
+		animState = false
+		useRate = true
+		toggleInEditor = true
+		toggleInFlight = true
+		toggleInFlight = true
+		unfocusedRange = 5
+		toggleName = #autoLOC_502011 //#autoLOC_502011 = Toggle Lights
+		eventOnName = #autoLOC_502012 //#autoLOC_502012 = Lights On
+		eventOffName = #autoLOC_502013 //#autoLOC_502013 = Lights Off
+		toggleAction = True
+		defaultActionGroup = Light
+		redCurve
+		{
+			key = 0 0 0 3
+			key = 1 1 0 0
+		}
+		greenCurve
+		{
+			key = 0 0 0 1
+			key = 1 1 1 0
+		}
+		blueCurve
+		{
+			key = 0 0 0 0
+			key = 1 0.7 1.5 0
+		}
+		alphaCurve
+		{
+			key = 0 1
+		}
+	}
+ }

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

@@ -3,7 +3,7 @@
 // - Kickback (MassiveBooster)
 // - Thumper (solidBooster1-1)
 // - Hammer (solidBooster)
-// - Flea (solidBooster_sm)
+// - Flea (solidBooster_sm_v2)
 // - Separatron I (sepMotor1)
 
 // Kickback
@@ -287,7 +287,7 @@
 }
 
 // Hammer
-@PART[solidBooster] {
+@PART[solidBooster_v2] {
   @author = Chris Adderley (Nertea)
 
   !mesh = DELETE
@@ -297,9 +297,9 @@
   }
   %rescaleFactor = 1
   @scale = 1
-  @node_stack_bottom = 0.0, -1.5640875, 0.0, 0.0, -1.0, 0.0, 1
-  @node_stack_top = 0.0, 1.2818375, 0.0, 0.0, 1.0, 0.0, 1
-  @node_attach = 0.0, 0.0, -0.625, 0.0, 0.0, 1.0, 1
+  // @node_stack_bottom = 0.0, -1.5640875, 0.0, 0.0, -1.0, 0.0, 1
+  // @node_stack_top = 0.0, 1.2818375, 0.0, 0.0, 1.0, 0.0, 1
+  // @node_attach = 0.0, 0.0, -0.625, 0.0, 0.0, 1.0, 1
 
   !fx_exhaustFlame_yellow = DELETE
   !fx_smokeTrail_medium = DELETE
@@ -387,10 +387,49 @@
 		@animationName = restock-srb-hammer-heat-1
 		@responseSpeed = 0.1
 	}
+  @MODULE[ModulePartVariants]
+  {
+    baseVariant = White
+    !primaryColor = DELETE
+    !secondaryColor = DELETE
+    !baseDisplayName = DELETE
+    !baseThemeName = DELETE
+    VARIANT
+    {
+      name = White
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      displayName = #autoLOC_8007119
+      themeName = White
+      GAMEOBJECTS
+      {
+        YellowStripe = false
+        OrangeStripe = false
+      }
+    }
+    @VARIANT[YellowAndWhite]
+    {
+      !TEXTURE {}
+      GAMEOBJECTS
+			{
+				YellowStripe = true
+        OrangeStripe = false
+			}
+    }
+    @VARIANT[Orange]
+    {
+      !TEXTURE {}
+      GAMEOBJECTS
+			{
+				YellowStripe = false
+        OrangeStripe = true
+			}
+    }
+  }
 }
 
 // Flea
-@PART[solidBooster_sm] {
+@PART[solidBooster_sm_v2] {
   @author = Chris Adderley (Nertea)
 
   !mesh = DELETE
@@ -488,6 +527,45 @@
 		dependOnEngineState = True
 		dependOnThrottle = True
 	}
+  @MODULE[ModulePartVariants]
+  {
+    baseVariant = White
+    !primaryColor = DELETE
+    !secondaryColor = DELETE
+    !baseDisplayName = DELETE
+    !baseThemeName = DELETE
+    VARIANT
+    {
+      name = White
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      displayName = #autoLOC_8007119
+      themeName = White
+      GAMEOBJECTS
+      {
+        YellowStripe = false
+        OrangeStripe = false
+      }
+    }
+    @VARIANT[YellowAndWhite]
+    {
+      !TEXTURE {}
+      GAMEOBJECTS
+			{
+				YellowStripe = true
+        OrangeStripe = false
+			}
+    }
+    @VARIANT[Orange]
+    {
+      !TEXTURE {}
+      GAMEOBJECTS
+			{
+				YellowStripe = false
+        OrangeStripe = true
+			}
+    }
+  }
 }
 // Separatron
 @PART[sepMotor1] {
@@ -506,7 +584,7 @@
   !sound_vent_medium = DELETE
   !sound_rocket_mini = DELETE
   !sound_vent_soft = DELETE
-  
+
   EFFECTS
 	{
     engage
@@ -561,16 +639,17 @@
 				speed = 0.0 0.35
 				speed = 1.0 1.0
 			}
-			
+
 
 		}
   }
-  
+
   @MODULE[ModuleEngines]
   {
     @name = ModuleEnginesFX
     %runningEffectName = fx-separatron-running
   }
+
   MODULE
 	{
 		name = FXModuleAnimateThrottle

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

@@ -10,24 +10,26 @@
   @author = Porkjet
 
   !mesh = DELETE
-  !MODEL = {}
+  !MODEL {}
   MODEL {
     model = ReStock/Assets/FuelTank/restock-fueltank-125-4
   }
+  !MODULE[ModulePartVariants] {}
 }
 
 @PART[fuelTankSmall]
 {
   @author = Porkjet
-  @node_stack_top = 0.0, 5.5525, 0.0, 0.0, 1.0, 0.0
-  @node_stack_bottom = 0.0, -5.5525, 0.0, 0.0, -1.0, 0.0
-  @node_attach = 6.2625, 0.0, 0.0, 1.0, 0.0, 0.0, 1
+  // @node_stack_top = 0.0, 5.5525, 0.0, 0.0, 1.0, 0.0
+  // @node_stack_bottom = 0.0, -5.5525, 0.0, 0.0, -1.0, 0.0
+  // @node_attach = 6.2625, 0.0, 0.0, 1.0, 0.0, 0.0, 1
   !mesh = DELETE
-  !MODEL = {}
+  !MODEL {}
   MODEL {
     model = ReStock/Assets/FuelTank/restock-fueltank-125-3
   }
   %rescaleFactor = 1
+  !MODULE[ModulePartVariants] {}
 }
 
 @PART[fuelTank]
@@ -35,26 +37,28 @@
   @author = Porkjet
 
   !mesh = DELETE
-  !MODEL = {}
+  !MODEL {}
   MODEL {
     model = ReStock/Assets/FuelTank/restock-fueltank-125-2
   }
   %rescaleFactor = 1
-  @node_stack_top = 0.0, 9.81725, 0.0, 0.0, 1.0, 0.0
-  @node_stack_bottom = 0.0, -9.12500, 0.0, 0.0, -1.0, 0.0
-  @node_attach = 6.2625, 0.0, 0.0, 1.0, 0.0, 0.0, 1
+  !MODULE[ModulePartVariants] {}
+  // @node_stack_top = 0.0, 9.81725, 0.0, 0.0, 1.0, 0.0
+  // @node_stack_bottom = 0.0, -9.12500, 0.0, 0.0, -1.0, 0.0
+  // @node_attach = 6.2625, 0.0, 0.0, 1.0, 0.0, 0.0, 1
 }
 
 @PART[fuelTank_long]
 {
   @author = Porkjet
-  @node_stack_top = 0.0, 18.75, 0.0, 0.0, 1.0, 0.0
-  @node_stack_bottom = 0.0, -18.87500, 0.0, 0.0, -1.0, 0.0
-  @node_attach = 6.2625, 0.0, 0.0, 1.0, 0.0, 0.0, 1
+  // @node_stack_top = 0.0, 18.75, 0.0, 0.0, 1.0, 0.0
+  // @node_stack_bottom = 0.0, -18.87500, 0.0, 0.0, -1.0, 0.0
+  // @node_attach = 6.2625, 0.0, 0.0, 1.0, 0.0, 0.0, 1
   !mesh = DELETE
-  !MODEL = {}
+  !MODEL {}
   MODEL {
     model = ReStock/Assets/FuelTank/restock-fueltank-125-1
   }
+  !MODULE[ModulePartVariants] {}
   %rescaleFactor = 1
 }

Distribution/Restock/GameData/ReStock/Patches/Science/restock-science.cfg

@@ -4,6 +4,8 @@
 // - Barometer (sensorBarometer)
 // - Accelerometer (sensorAccelerometer)
 // - Negative Gravioli Detector (sensorGravimeter)
+// - Mystery Goo™ Containment Unit (GooExperiment)
+// - SC-9001 Science Jr. (science_module)
 
 // Thermometer
 @PART[sensorThermometer] {
@@ -47,4 +49,66 @@
   MODEL {
     model = ReStock/Assets/Science/restock-gravimeter
   }
+}
+
+// Mystery Goo™ Containment Unit
+@PART[GooExperiment] {
+  @author = Andrew Cassidy
+
+  !mesh = DELETE
+  !MODEL = {}
+  MODEL {
+    model = ReStock/Assets/Science/restock-goocanister-radial-1
+  }
+
+  MODULE {
+    name = ModulePartVariants
+    baseVariant = Truss
+
+    VARIANT {
+      name = Truss
+      displayName = #LOC_Restock_variant-mounting_truss
+      themeName = White
+
+      primaryColor = #ffffff
+      secondaryColor = #000000
+
+      GAMEOBJECTS {
+        Mount_Compact = false
+        Mount_Truss = true
+      }
+    }
+
+    VARIANT {
+      name = Compact
+      displayName = #LOC_Restock_variant-mounting_compact
+      themeName = White
+
+      primaryColor = #ffffff
+      secondaryColor = #707070
+
+      GAMEOBJECTS {
+        Mount_Compact = true
+        Mount_Truss = false
+      }
+    }
+  }
+}
+
+// SC-9001 Science Jr.
+@PART[science_module] {
+  @author = Andrew Cassidy
+
+  !mesh = DELETE
+  !MODEL = {}
+  MODEL {
+    model = ReStock/Assets/Science/restock-materialbay-125-1
+  }
+
+  // original model was scaled by 0.1x and had a rescalefactor of 1.25, so we have to reset that
+  rescaleFactor = 1
+  @scale = 1
+  @node_stack_top = 0.0, 0.6125, 0.0, 0.0, 1.0, 0.0
+  @node_stack_bottom = 0.0, -0.5125, 0.0, 0.0, -1.0, 0.0
+  @node_attach = 0.0, 0.0, 0.62625, 0.0, 0.0, -1.0, 1
 }

Distribution/Restock/changelog.txt

@@ -10,7 +10,10 @@
   - .625m reaction wheel (Andrew Cassidy)
  - Coupling
   - Inline Clamp-O-Tron (Passinglurker)
+  - Clamp-O-Tron Jr. Docking Port (Nertea)
   - Clamp-O-Tron Docking Port (Nertea)
+  - Clamp-O-Tron Sr. Docking Port (Nertea)
+  - Clamp-O-Tron Shielded Port (Nertea)
  - Aero
   - Aerodynamic Nose Cone (Nertea)
   - Protective Rocket Nose Cone Mk7 (Nertea)