Merge pull request #594 from PorktoberRevolution/master

Release 0.1.4

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "Assets/CineboxAndrew"]
+	path = Assets/CineboxAndrew
+	url = https://github.com/drewcassidy/ReStocked-Assets.git

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

@@ -19,6 +19,9 @@ Localization
     #LOC_Restock_variant-mounting_truss = Truss
     #LOC_Restock_variant-mounting_compact = Compact
 
+    #LOC_Restock_variant-engine_pod-orange = Pod (Orange)
+    #LOC_Restock_variant-engine_pod-grey = Pod (Grey)
+
     #LOC_Restock_variant-antenna_size0 = 0.625m
     #LOC_Restock_variant-antenna_size1 = 1.25m
     #LOC_Restock_variant-antenna_truss = Truss

Distribution/Restock/GameData/ReStock/Localization/fr-fr.cfg

@@ -0,0 +1,46 @@
+// Courtesy of Challyss of the KSP forums
+
+Localization
+{
+  fr-fr
+  {
+    #LOC_Restock_variant-engine_size0 = 0.625m
+    #LOC_Restock_variant-engine_size1 = 1.25m
+    #LOC_Restock_variant-engine_size2 = 2.5m
+    #LOC_Restock_variant-engine_size3 = 3.75m
+    #LOC_Restock_variant-engine_compact = Compact
+    #LOC_Restock_variant-engine_radial = Radial
+    #LOC_Restock_variant-engine_boattail = Caréné
+
+    #LOC_Restock_variant-mounting_truss = Treillis
+    #LOC_Restock_variant-mounting_compact = Compact
+
+    #LOC_Restock_variant-antenna_size0 = 0.625m
+    #LOC_Restock_variant-antenna_size1 = 1.25m
+    #LOC_Restock_variant-antenna_truss = Treillis
+    #LOC_Restock_variant-antenna_compact = Compact
+    #LOC_Restock_variant-antenna_radial = Radial
+    #LOC_Restock_variant-antenna_radial_reverse = Radial (Inversé)
+    #LOC_Restock_variant-antenna_axial = Axial
+    #LOC_Restock_variant-antenna_axial_reverse = Axial (Inversé)
+
+    #LOC_Restock_variant-surface_metal = Métal
+
+    #LOC_Restock_variant-service-bay-opaque = Bases pleines
+    #LOC_Restock_variant-service-bay-transparent = Bases treillis
+    #LOC_Restock_variant-service-bay-hollow = Bases vides
+
+    #LOC_Restock_variant-heat-shield-black = Noir
+    #LOC_Restock_variant-heat-shield-brown = Classique
+    #LOC_Restock_variant-heat-shield-red = Brut
+
+    #LOC_Restock_variant-linear-rcs-pod = Caréné
+    #LOC_Restock_variant-linear-rcs-bare = Nu
+
+    #LOC_Restock_variant-stayputnik-pod = Support
+    #LOC_Restock_variant-stayputnik-bare = Sans support
+    #LOC_Restock_variant-probe-gold = Doré
+    #LOC_Restock_variant-probe-silver = Argenté
+    #LOC_Restock_variant-probe-bare = Basique
+  }
+}

Distribution/Restock/GameData/ReStock/Patches/Control/restock-rcs.cfg

@@ -1,18 +1,18 @@
 // Patches applying art changes to RCS blocks
 // Contents:
-// - RV-105 RCS Thruster Block (RCSBlock)
+// - RV-105 RCS Thruster Block (RCSBlock_v2)
 // - Place-Anywhere 7 Linear RCS Port (linearRcs)
 // - Vernor Engine (vernorEngine)
 
 // RCS block
-@PART[RCSBlock]
+@PART[RCSBlock_v2]
 {
   @author = Chris Adderley (Nertea)
   !mesh = DELETE
   !MODEL {}
   MODEL
   {
-    model = ReStock/Assets/Control/restock-rcs-block-1
+    model = ReStock/Assets/Control/restock-rcs-block-2
   }
   !EFFECTS {}
   EFFECTS
@@ -58,6 +58,8 @@
       }
     }
   }
+
+  !MODULE[FXModuleAnimateRCS] {}
 }
 
 // Linear RCS port
@@ -187,4 +189,7 @@
       }
     }
   }
+
+
+  !MODULE[FXModuleAnimateRCS] {}
 }

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

@@ -1,13 +1,13 @@
 // Patches applying art changes to 0.625m engines
 // Contents:
-// - LV-1 "Ant" Liquid Fuel Engine (microEngine)
-// - LV-1R "Spider" Liquid Fuel Engine (radialEngineMini)
+// - LV-1 "Ant" Liquid Fuel Engine (microEngine_v2)
+// - LV-1R "Spider" Liquid Fuel Engine (radialEngineMini_v2)
 // - 48-7S "Spark" Liquid Fuel Engine (liquidEngineMini_v2)
-// - 24-77 "Twitch" Liquid Fuel Engine (smallRadialEngine)
+// - 24-77 "Twitch" Liquid Fuel Engine (smallRadialEngine_v2)
 // - O-10 "Puff" MonoPropellant Fuel Engine (omsEngine)
 
 // Ant
-@PART[microEngine]
+@PART[microEngine_v2]
 {
   @author = Chris Adderley (Nertea)
   !mesh = DELETE
@@ -75,6 +75,7 @@
     @runningEffectName = fx-ant-running
     @fxOffset = 0, 0, 0
   }
+  !MODULE[ModulePartVariants] {}
   !MODULE[FXModuleAnimateThrottle] {}
   MODULE
   {
@@ -165,7 +166,7 @@
 }
 
 // Spider
-@PART[radialEngineMini]
+@PART[radialEngineMini_v2]
 {
   @author = Chris Adderley (Nertea)
   !mesh = DELETE
@@ -229,6 +230,7 @@
       }
     }
   }
+  !MODULE[ModulePartVariants] {}
   @MODULE[ModuleEnginesFX]
   {
     @runningEffectName = fx-spider-running
@@ -691,14 +693,14 @@
 }
 
 // Twitch
-@PART[smallRadialEngine]
+@PART[smallRadialEngine_v2]
   {
   @author = Chris Adderley (Nertea)
   !mesh = DELETE
   !MODEL {}
   MODEL
   {
-    model = ReStock/Assets/Engine/restock-engine-twitch-1
+    model = ReStock/Assets/Engine/restock-engine-twitch-2
   }
   !EFFECTS {}
   EFFECTS
@@ -799,29 +801,159 @@
       }
     }
   }
+
+  !MODULE[ModulePartVariants] {}
+
+  MODULE
+  {
+    name = ModulePartVariants
+    baseVariant = Orange
+    VARIANT
+    {
+      name = Orange
+      displayName = #autoLOC_8007123
+      themeName = Orange
+      primaryColor = #f49841
+      secondaryColor = #f49841
+      GAMEOBJECTS
+      {
+        CompactStructureGrey = false
+        CompactStructureOrange = true
+        StructureRadialGrey = false
+        StructureRadialOrange = false
+        CylBotPod001 = false
+        CylBotPod002 = false
+        CylTopPod001 = false
+        CylTopPod002 = false
+        CylBotBare001 = true
+        CylBotBare002 = true
+        CylTopBare001 = true
+        CylTopBare002 = true
+        EnginePod = false
+        EngineBare = true
+      }
+
+    }
+    VARIANT
+    {
+      name = GrayAndOrange
+      displayName = #autoLOC_8007121
+      themeName = GrayAndOrange
+      primaryColor = #4c4f47
+      secondaryColor = #f49841
+      GAMEOBJECTS
+      {
+        CompactStructureGrey = true
+        CompactStructureOrange = false
+        StructureRadialGrey = false
+        StructureRadialOrange = false
+        CylBotPod001 = false
+        CylBotPod002 = false
+        CylTopPod001 = false
+        CylTopPod002 = false
+        CylBotBare001 = true
+        CylBotBare002 = true
+        CylTopBare001 = true
+        CylTopBare002 = true
+        EnginePod = false
+        EngineBare = true
+      }
+    }
+    VARIANT
+    {
+      name = OrangePodded
+      displayName = #LOC_Restock_variant-engine_pod-orange
+      primaryColor = #f49841
+      secondaryColor = #f49841
+      GAMEOBJECTS
+      {
+        CompactStructureGrey = false
+        CompactStructureOrange = false
+        StructureRadialGrey = false
+        StructureRadialOrange = true
+        CylBotPod001 = true
+        CylBotPod002 = true
+        CylTopPod001 = true
+        CylTopPod002 = true
+        CylBotBare001 = false
+        CylBotBare002 = false
+        CylTopBare001 = false
+        CylTopBare002 = false
+        EnginePod = true
+        EngineBare = false
+      }
+    }
+    VARIANT
+    {
+      name = GrayAndOrangePodded
+      displayName = #LOC_Restock_variant-engine_pod-grey
+      primaryColor = #4c4f47
+      secondaryColor = #f49841
+      GAMEOBJECTS
+      {
+        CompactStructureGrey = false
+        CompactStructureOrange = false
+        StructureRadialGrey = true
+        StructureRadialOrange = false
+        CylBotPod001 = true
+        CylBotPod002 = true
+        CylTopPod001 = true
+        CylTopPod002 = true
+        CylBotBare001 = false
+        CylBotBare002 = false
+        CylTopBare001 = false
+        CylTopBare002 = false
+        EnginePod = true
+        EngineBare = false
+      }
+    }
+    useMultipleDragCubes = false
+  } 
   MODULE
   {
     name = FXModuleLookAtConstraint
-    // Ringed
+    // Bare
+    CONSTRAINLOOKFX
+    {
+      targetName = CylBotBare001
+      rotatorsName = CylTopBare001
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = CylBotBare002
+      rotatorsName = CylTopBare002
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = CylTopBare001
+      rotatorsName = CylBotBare001
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = CylTopBare002
+      rotatorsName = CylBotBare002
+    }
+
+    // Podded
     CONSTRAINLOOKFX
     {
-      targetName = CylBotRad001
-      rotatorsName = CylTopRad001
+      targetName = CylBotPod001
+      rotatorsName = CylTopPod001
     }
     CONSTRAINLOOKFX
     {
-      targetName = CylBotRad002
-      rotatorsName = CylTopRad002
+      targetName = CylBotPod002
+      rotatorsName = CylTopPod002
     }
     CONSTRAINLOOKFX
     {
-      targetName = CylTopRad001
-      rotatorsName = CylBotRad001
+      targetName = CylTopPod001
+      rotatorsName = CylBotPod001
     }
     CONSTRAINLOOKFX
     {
-      targetName = CylTopRad002
-      rotatorsName = CylBotRad002
+      targetName = CylTopPod002
+      rotatorsName = CylBotPod002
     }
   }
   @MODULE[ModuleEnginesFX]