Merge pull request #63 from PorktoberRevolution/rcs-parts

Merge in RCS and light parts

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

@@ -29,5 +29,8 @@ Localization
     #LOC_Restock_variant-heat-shield-brown = Classic
     #LOC_Restock_variant-heat-shield-red = Unpainted
 
+    #LOC_Restock_variant-linear-rcs-pod = Podded
+    #LOC_Restock_variant-linear-rcs-bare = Bare
+
   }
 }

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

@@ -0,0 +1,46 @@
+// Patches applying art changes to lights
+// Contents:
+// - Illuminator Mk1 (spotLight1)
+// - Illuminator Mk2 (spotLight2)
+
+// Spotlight
+@PART[spotLight1]
+{
+	@author = Chris Adderley (Nertea)
+	!mesh = DELETE
+	!MODEL,* {}
+	MODEL
+	{
+		model = ReStock/Assets/Electrical/restock-light-spot-1
+		position = 0.0, 0.0, 0.0
+		scale = 1,1,1
+		rotation = 0, 0, 0
+	}
+
+	@MODULE[ModuleLight]
+	{
+		@animationName = RestockSpotLight_On
+	}
+//	MODEL
+//	{
+//		model = Squad/Parts/Utility/spotLightMk1/model
+//	}
+}
+// Floodlight
+@PART[spotLight2]
+{
+	@author = Chris Adderley (Nertea)
+	!mesh = DELETE
+	!MODEL,* {}
+	MODEL
+	{
+		model = ReStock/Assets/Electrical/restock-light-flood-1
+		position = 0.0, 0.0, 0.0
+		scale = 1,1,1
+		rotation = 0, 0, 0
+	}
+  @MODULE[ModuleLight]
+	{
+		@animationName = RestockFloodLight_On
+	}
+}

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

@@ -0,0 +1,60 @@
+// Patches applying art changes to RCS blocks
+// Contents:
+// - RV-105 RCS Thruster Block (RCSBlock)
+// - Place-Anywhere 7 Linear RCS Port (linearRcs)
+
+// RCS block
+@PART[RCSBlock]
+{
+  @author = Chris Adderley (Nertea)
+
+  !mesh = DELETE
+  !MODEL {}
+  MODEL {
+    model = ReStock/Assets/Control/restock-rcs-block-1
+  }
+}
+
+// Linear RCS port
+@PART[linearRcs]
+{
+  @author = Chris Adderley (Nertea)
+
+  !mesh = DELETE
+  !MODEL {}
+  MODEL {
+    model = ReStock/Assets/Control/restock-rcs-linear-1
+  }
+
+  MODULE
+  {
+    name = ModulePartVariants
+    baseVariant = Pod
+    VARIANT
+    {
+      name = Pod
+      displayName = #LOC_Restock_variant-linear-rcs-pod
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        RCSLinear = true
+        RCSLinearBase = false
+      }
+    }
+    VARIANT
+    {
+      name = Bare
+      displayName = #LOC_Restock_variant-linear-rcs-bare
+
+      primaryColor = #999999
+      secondaryColor = #999999
+    GAMEOBJECTS
+    {
+      RCSLinear = false
+      RCSLinearBase = true
+    }
+    }
+  }
+
+}

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

@@ -1,9 +1,9 @@
 // Patches applying art changes to 1.25m SRB engines
 // Contents:
-// - Kickback (MassiveBooster)
-// - Thumper (solidBooster1-1)
-// - Hammer (solidBooster)
-// - Flea (solidBooster_sm_v2)
+// - S1 SRB-KD25k "Kickback" Solid Fuel Booster (MassiveBooster)
+// - BACC "Thumper" Solid Fuel Booster (solidBooster1-1)
+// - RT-10 "Hammer" Solid Fuel Booster (solidBooster_v2)
+// - RT-5 "Flea" Solid Fuel Booster (solidBooster_sm_v2)
 // - Separatron I (sepMotor1)
 
 // Kickback

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

@@ -0,0 +1,72 @@
+// Patches applying art changes to RCS tanks
+// Contents:
+// - Stratus-V Roundified Monopropellant Tank (radialRCSTank)
+// - Stratus-V Cylindrified Monopropellant Tank (rcsTankRadialLong)
+// - FL-R10 RCS Fuel Tank (rcsTankMini)
+// - FL-R25 RCS Fuel Tank (RCSFuelTank)
+// - FL-R1 RCS Fuel Tank (RCSTank1-2)
+
+//  Spherical Radial Tank
+@PART[radialRCSTank]
+{
+  @author = Chris Adderley (Nertea)
+
+  !mesh = DELETE
+  !MODEL {}
+  MODEL {
+    model = ReStock/Assets/FuelTank/restock-fueltank-rcs-radial-1
+  }
+
+}
+
+//  Capsule Radial Tank
+@PART[rcsTankRadialLong]
+{
+  @author = Chris Adderley (Nertea)
+
+  !mesh = DELETE
+  !MODEL {}
+  MODEL {
+    model = ReStock/Assets/FuelTank/restock-fueltank-rcs-radial-2
+  }
+
+}
+
+// 0.625m Tank
+@PART[rcsTankMini]
+{
+  @author = Chris Adderley (Nertea)
+
+  !mesh = DELETE
+  !MODEL {}
+  MODEL {
+    model = ReStock/Assets/FuelTank/restock-fueltank-rcs-0625-1
+  }
+
+
+}
+
+// 1.25m Tank
+@PART[RCSFuelTank]
+{
+  @author = Chris Adderley (Nertea)
+
+  !mesh = DELETE
+  !MODEL {}
+  MODEL {
+    model = ReStock/Assets/FuelTank/restock-fueltank-rcs-125-1
+  }
+}
+
+// 2.5m Tank
+@PART[RCSTank1-2]
+{
+  @author = Chris Adderley (Nertea)
+
+  !mesh = DELETE
+  !MODEL {}
+  MODEL {
+    model = ReStock/Assets/FuelTank/restock-fueltank-rcs-25-1
+  }
+  !MODULE[ModulePartVariants] {}
+}

Distribution/Restock/changelog.txt

@@ -7,6 +7,8 @@
   - PPD-10 Hitchhiker Storage Container (Nertea)
  - Control
   - .625m reaction wheel (Andrew Cassidy)
+  - RV-105 RCS Thruster Block (Nertea)
+  - Place-Anywhere 7 Linear RCS Port (Nertea)
  - Coupling
   - Inline Clamp-O-Tron (Passinglurker)
   - Clamp-O-Tron Jr. Docking Port (Nertea)
@@ -35,10 +37,10 @@
   - Kerbodyne ADTP-2-3 (Nertea)
  - Fuel Tanks
   - Oscar-B Fuel Tank (Beale)
-  - FL-T200 Fuel Tank Porkjet
-  - FL-T400 Fuel Tank Porkjet
-  - FL-T800 Fuel Tank Porkjet
-  - FL-T100 Fuel Tank Porkjet
+  - FL-T200 Fuel Tank (Porkjet/Nertea)
+  - FL-T400 Fuel Tank (Porkje/Nerteat)
+  - FL-T800 Fuel Tank (Porkjet/Nertea)
+  - FL-T100 Fuel Tank (Porkjet/Nertea)
   - Rockomax Jumbo-64 Fuel Tank (Nertea)
   - Rockomax X200-16 Fuel Tank (Nertea)
   - Rockomax X200-32 Fuel Tank (Nertea)
@@ -49,12 +51,17 @@
   - PB-X150 Xenon Container (Nertea)
   - PB-X750 Xenon Container (Nertea)
   - PB-X50R Xenon Container (Nertea)
+  - Stratus-V Roundified Monopropellant Tank (Nertea)
+  - Stratus-V Cylindrified Monopropellant Tank (Nertea)
+  - FL-R10 RCS Fuel Tank (Nertea)
+  - FL-R25 RCS Fuel Tank (Nertea)
+  - FL-R1 RCS Fuel Tank (Nertea)
  - Engines
   - Separatron I (Nertea)
-  - Flea (Nertea)
-  - Hammer (Nertea)
-  - Thumper (Nertea)
-  - Kickback (Nertea)
+  - RT-5 "Flea" Solid Fuel Booster (Nertea)
+  - RT-10 "Hammer" Solid Fuel Booster (Nertea)
+  - BACC "Thumper" Solid Fuel Booster (Nertea)
+  - S1 SRB-KD25k "Kickback" Solid Fuel Booster (Nertea)
   - LV-1 "Ant" Liquid Fuel Engine (Nertea)
   - LV-1R "Spider" Liquid Fuel Engine (Nertea)
   - 48-7S "Spark" Liquid Fuel Engine (Nertea)
@@ -87,6 +94,7 @@
 - Engines are all surface attachable
 - New 'Metallic' variant for 2.5m tanks
 - New Unpainted, Black variants for heat shields
+- New Bare variant for Linear RCS
 - Engines have a basic and a compact variant
 - Most atmospheric engines also have a boattail variant
 - New plumes/FX for all redone engines