Merge branch 'master' of git@github.com:PorktoberRevolution/ReStocked.git

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

@@ -70,7 +70,7 @@
 	%rescaleFactor = 1
 	@MODULE[ModuleAnchoredDecoupler]
 	{
-		@anchor = LargeDecouplerBase
+		@anchorName = LargeDecouplerBase
 	}
 }
 
@@ -88,7 +88,7 @@
 	%rescaleFactor = 1
 	@MODULE[ModuleAnchoredDecoupler]
 	{
-		@anchor = SmallDecouplerBase
+		@anchorName = SmallDecouplerBase
 	}
 }
 
@@ -105,6 +105,6 @@
 	%rescaleFactor = 1
 	@MODULE[ModuleAnchoredDecoupler]
 	{
-		@anchor = WeirdDecouplerBase
+		@anchorName = WeirdDecouplerBase
 	}
 }

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

@@ -0,0 +1,149 @@
+// Patches applying art changes to solar panels
+// Contents:
+// -  (solarPanels4)
+
+// 1x6
+@PART[solarPanels4]
+{
+	@author = Beale
+	!mesh = DELETE
+	!MODEL,* {}
+	MODEL
+	{
+		model = ReStock/Assets/Electrical/restock-solarpanel-1x6
+		position = 0.0, 0.0, 0.0
+		scale = 1,1,1
+		rotation = 0, 0, 0
+	}
+	@MODULE[ModuleDeployableSolarPanel]
+	{
+		@secondaryTransformName = panel6
+	}
+
+	MODULE
+  {
+      name = ModuleRestockModifyMaterials
+      MATERIAL
+      {
+          shader = KSP/Bumped Specular (Mapped)
+          TEXTURE_PROPERTY
+          {
+              name = _MainTex
+              textureUrl = ReStock/Assets/Electrical/restock-solarpanel-1
+          }
+          TEXTURE_PROPERTY
+          {
+              name = _SpecMap
+              textureUrl = ReStock/Assets/Electrical/restock-solarpanel-1-s
+          }
+          FLOAT_PROPERTY
+          {
+              name = _SpecTint
+              value = 0.08
+          }
+          FLOAT_PROPERTY
+          {
+              name = _Shininess
+              value = 0.8
+          }
+      }
+  }
+}
+
+// 1x6 shielded
+@PART[solarPanels2]
+{
+  @author = Beale
+  !mesh = DELETE
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Electrical/restock-solarpanel-1x6-shrouded
+    position = 0.0, 0.0, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+  @MODULE[ModuleDeployableSolarPanel]
+  {
+    @secondaryTransformName = panel6
+  }
+
+  MODULE
+  {
+      name = ModuleRestockModifyMaterials
+      
+      MATERIAL
+      {
+          shader = KSP/Bumped Specular (Mapped)
+          baseTransform = panel1
+          TEXTURE_PROPERTY
+          {
+              name = _MainTex
+              textureUrl = ReStock/Assets/Electrical/restock-solarpanel-1
+          }
+          TEXTURE_PROPERTY
+          {
+              name = _SpecMap
+              textureUrl = ReStock/Assets/Electrical/restock-solarpanel-1-s
+          }
+          FLOAT_PROPERTY
+          {
+              name = _SpecTint
+              value = 0.08
+          }
+          FLOAT_PROPERTY
+          {
+              name = _Shininess
+              value = 0.8
+          }
+      }
+  }
+}
+
+// 2x3
+@PART[solarPanels3]
+{
+	@author = Beale
+	!mesh = DELETE
+	!MODEL,* {}
+	MODEL
+	{
+		model = ReStock/Assets/Electrical/restock-solarpanel-2x3
+		position = 0.0, 0.0, 0.0
+		scale = 1,1,1
+		rotation = 0, 0, 0
+	}
+	@MODULE[ModuleDeployableSolarPanel]
+	{
+		@secondaryTransformName = solar6
+	}
+	MODULE
+  {
+      name = ModuleRestockModifyMaterials
+      MATERIAL
+      {
+          shader = KSP/Bumped Specular (Mapped)
+          TEXTURE_PROPERTY
+          {
+              name = _MainTex
+              textureUrl = ReStock/Assets/Electrical/restock-solarpanel-1
+          }
+          TEXTURE_PROPERTY
+          {
+              name = _SpecMap
+              textureUrl = ReStock/Assets/Electrical/restock-solarpanel-1-s
+          }
+          FLOAT_PROPERTY
+          {
+              name = _SpecTint
+              value = 0.08
+          }
+          FLOAT_PROPERTY
+          {
+              name = _Shininess
+              value = 0.8
+          }
+      }
+  }
+}
+

Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-decouplers.cfg

@@ -0,0 +1,17 @@
+// Patches applying art changes to Making History decouplers
+// Contents:
+- TD-18 Decoupler (Decoupler_1p5)
+
+
+// TD-18 Decoupler
+@PART[Decoupler_1p5] {
+	@author = Chris Adderley (Nertea)
+
+	!mesh = DELETE
+	!MODEL {}
+	MODEL {
+		model = ReStock/Assets/Coupling/restock-decoupler-1875-1
+	}
+
+	%rescaleFactor = 1
+}

Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-separators.cfg

@@ -0,0 +1,16 @@
+// Patches applying art changes to Making History separators
+// Contents:
+- TS-18 Separator (Separator_1p5)
+
+// TS-18 Separator
+@PART[Separator_1p5] {
+	@author = Chris Adderley (Nertea)
+
+	!mesh = DELETE
+	!MODEL {}
+	MODEL {
+		model = ReStock/Assets/Coupling/restock-separator-1875-1
+	}
+
+	%rescaleFactor = 1
+}

Distribution/Restock/GameData/ReStock/PatchesMH/FuelTank/restock-mh-fueltanks-rcs.cfg

@@ -0,0 +1,14 @@
+// Patches applying art changes to Making History RCS tanks
+// Contents:
+// -  (MonoPropMini)
+
+//  Spherical Radial Tiny Tank
+@PART[MonoPropMini]
+{
+  @author = Chris Adderley (Nertea)
+  !mesh = DELETE
+  !MODEL {}
+  MODEL {
+    model = ReStock/Assets/FuelTank/restock-fuel-tank-rcs-radial-tiny-1
+  }
+}

Distribution/Restock/GameData/ReStock/PatchesMH/Payload/restock-mh-fairing-bases.cfg

@@ -0,0 +1,118 @@
+// Patches applying art changes to Making History fairings
+// Contents:
+- AE-FF1.5 Airstream Protective Shell (1.875m) (fairingSize1p5)
+
+@PART[fairingSize1p5]
+{
+  @author = Chris Adderley (Nertea)
+
+  !mesh = DELETE
+  !MODEL {}
+  MODEL {
+    model = ReStock/Assets/Payload/restock-fairing-base-1875-1
+  }
+  MODEL
+	{
+		model = Squad/Parts/Aero/fairings/AutoTruss
+		scale = 1.5,1.5,1.5
+		position = 0.0,0.22,0.0
+	}
+
+  @MODULE[ModuleProceduralFairing]
+  {
+    @pivot = 0,0.151, 0
+    @TextureURL = ReStock/Assets/Payload/restock-fairing-25-1
+    @CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1
+    @TextureNormalURL = ReStock/Assets/Payload/restock-fairing-25-1-n
+  }
+
+  @MODULE[ModulePartVariants]
+  {
+    @VARIANT[White]
+    {
+      !TEXTURE {}
+      !EXTRA_INFO {}
+      TEXTURE
+      {
+        materialName=FairingIconShell
+        mainTextureURL =  ReStock/Assets/Payload/restock-fairing-125-1
+      }
+      EXTRA_INFO
+      {
+        FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-125-1
+        FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-125-1-n
+        CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1
+      }
+      GAMEOBJECTS
+      {
+        FairingBase1875White = true
+        FairingBase1875Orange = false
+        FairingBase1875BlackWhite = false
+      }
+    }
+    @VARIANT[Grey]
+    {
+      !TEXTURE {}
+      !EXTRA_INFO {}
+      TEXTURE
+      {
+        materialName=FairingIconShell
+        mainTextureURL =  ReStock/Assets/Payload/restock-fairing-125-1
+      }
+      EXTRA_INFO
+      {
+        FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-125-1
+        FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-125-1-n
+        CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1
+      }
+      GAMEOBJECTS
+      {
+        FairingBase1875White = false
+        FairingBase1875Orange = false
+        FairingBase1875BlackWhite = true
+      }
+    }
+    @VARIANT[Dark?Grey]
+    {
+      !TEXTURE {}
+      !EXTRA_INFO {}
+      TEXTURE
+      {
+        materialName=FairingIconShell
+        mainTextureURL =  ReStock/Assets/Payload/restock-fairing-125-1-orange
+      }
+      EXTRA_INFO
+      {
+        FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-125-1-orange
+        FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-125-1-n
+        CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-orange
+      }
+			GAMEOBJECTS
+      {
+        FairingBase1875White = false
+        FairingBase1875Orange = true
+        FairingBase1875BlackWhite = false
+      }
+    }
+  }
+  MODULE
+  {
+    name = ModuleRestockModifyFairingMaterials
+    COLOR_PROPERTY
+    {
+      name = _Color
+      color = 1.0, 1.0, 1.0, 1.0
+    }
+    COLOR_PROPERTY
+    {
+      name = _SpecColor
+      color = 0.753, 0.753, 0.753, 1.0
+    }
+
+    FLOAT_PROPERTY
+    {
+      name = _Shininess
+      value = 0.3
+    }
+  }
+}

Distribution/Restock/changelog.txt

@@ -1,7 +1,7 @@
 v0.1.0
 ------
 - Initial release
-- Parts included:
+- Stock parts included:
  - Command
   - Mk1 Command Pod (Nertea)
   - Mk1-3 Command Pod (Nertea)
@@ -20,8 +20,8 @@
   - RC-001S Remote Guidance Unit (Nertea)
  - Control
   - Small Inline Reaction Wheel (Andrew Cassidy)
-  - Advanced Inline Stabilizer (advSasModule)
-  - Advanced Reaction Wheel Module, Large (asasmodule1-2)
+  - Advanced Inline Stabilizer (Nertea)
+  - Advanced Reaction Wheel Module, Large (Nertea)
   - RV-105 RCS Thruster Block (Nertea)
   - Place-Anywhere 7 Linear RCS Port (Nertea)
   - Vernor Engine (Nertea)
@@ -130,7 +130,7 @@
   - Z-400 Rechargeable Battery (Nertea)
   - Z-100 Rechargeable Battery Pack (Nertea)
   - PB-NUK Radioisotope Thermoelectric Generator (Beale)
-- Science
+ - Science
   - Science Mobile Processing Lab MPL-LG-2 (Nertea)
   - Thermometer (Andrew Cassidy)
   - Barometer (Andrew Cassidy)
@@ -140,12 +140,20 @@
   - SC-9001 Science Jr. (Andrew Cassidy)
   - Atmospheric Fluid Spectro-Variometer (Andrew Cassidy)
   - Experiment Storage Unit (Andrew Cassidy)
-- Communications
+ - Communications
   - Communotron 88-88 (Andrew Cassidy)
   - HG-5 High Gain Antenna (Andrew Cassidy)
   - RA-2 Relay Antenna (Andrew Cassidy)
   - RA-15 Relay Antenna (Andrew Cassidy)
   - RA-100 Relay Antenna (Andrew Cassidy)
+- Making History parts included
+ - Coupling
+  - TD-18 Decoupler (Nertea)
+  - TS-18 Separator (Nertea)
+ - Fuel Tanks
+  - Stratus-V Minified Monopropellant Tank (Nertea)
+ - Payload
+  - AE-FF1.5 Airstream Protective Shell (Nertea)
 - Additions/new variants:
  - Probe cores now all have consistent 'Bare' and 'Gold Foil' variants, plus a generally new 'Silver' foil variant
  - 'Dark' variant for 1.25m tanks has been completely reworked (it is no longer white)