Merge branch 'MH-Pods' into develop

Distribution/Restock/GameData/ReStock/Compatibility/NearFutureProps.cfg

@@ -0,0 +1,73 @@
+// adds Near Future Props to Restock IVAs to fill them out more
+
+// Inflatable Airlock IVA
+@INTERNAL[restock-airlock-1-IVA]:NEEDS[NearFutureProps]:AFTER[ReStock]
+{
+
+  PROP
+  {
+    name = NF_PAPR_Clipboard_Log
+    position = -0.3309464,-0.001345975,-1.962911
+    rotation = -0.4704114,-0.4704107,-0.5279329,0.5279335
+    scale = 1,1,1
+  }
+
+  PROP
+  {
+    name = NF_RAIL_Small_Silver
+    position = 0,-0.281,-1.89
+    rotation = 4.619359E-07,0,0,1
+    scale = 1,1,1
+  }
+  PROP
+  {
+    name = NF_RAIL_Small_Silver
+    position = 0,0.281,-1.89
+    rotation = -1,0,0,4.619359E-07
+    scale = 1,1,1
+  }
+
+  PROP
+  {
+    name = NF_TANK_Wall_O2
+    position = 0.337,0,-0.112
+    rotation = 0,1,0,0
+    scale = 0.8,0.8,0.8
+  }
+  PROP
+  {
+    name = NF_TANK_Wall_O2
+    position = -0.337,0,-0.112
+    rotation = 0,1,0,0
+    scale = 0.8,0.8,0.8
+  }
+
+  PROP
+  {
+    name = NF_TANK_Wall_N2
+    position = 0.2382951,-0.2382949,-0.112
+    rotation = 0.3826832,0.9238797,0,0
+    scale = 0.8000004,0.8000001,0.8000005
+  }
+  PROP
+  {
+    name = NF_TANK_Wall_N2
+    position = -0.2382951,0.2382949,-0.112
+    rotation = 0.3826832,0.9238797,0,0
+    scale = 0.8000004,0.8000001,0.8000005
+  }
+  PROP
+  {
+    name = NF_TANK_Wall_N2
+    position = 0.238295,0.238295,-0.112
+    rotation = -0.3826834,0.9238796,0,0
+    scale = 0.8000003,0.8000001,0.8000005
+  }
+  PROP
+  {
+    name = NF_TANK_Wall_N2
+    position = -0.238295,-0.238295,-0.112
+    rotation = -0.3826834,0.9238796,0,0
+    scale = 0.8000003,0.8000001,0.8000005
+  }
+}

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

@@ -62,6 +62,8 @@ Localization
     #LOC_Restock_variant-mounting_classic_grey-orange = Classic (Orange/Grey Shroud)
     #LOC_Restock_variant-mounting_truss = Truss
     #LOC_Restock_variant-mounting_compact = Compact
+    #LOC_Restock_variant-mounting_mounted = Mounted
+
 
     #LOC_Restock_variant-gold-truss = Gold (Mounted)
     #LOC_Restock_variant-silver-truss = Silver (Mounted)
@@ -81,6 +83,11 @@ Localization
     #LOC_Restock_variant-telescope_shielded = Shielded
     #LOC_Restock_variant-telescope_bare = Bare
 
+    #LOC_Restock_variant-pod_bare = Bare
+    #LOC_Restock_variant-pod_fabric_green = Green Padding
+    #LOC_Restock_variant-pod_fabric_beige = Beige Padding
+    #LOC_Restock_variant-pod_fabric_white = White Padding
+
     #LOC_Restock_variant-wheel_broken = Broken
     #LOC_Restock_variant-wheel_bare = Bare
 

Distribution/Restock/GameData/ReStock/PatchesMH/Command/restock-mh-command-pods.cfg

@@ -0,0 +1,236 @@
+// Patches applying art changes to crewed command parts
+// Contents:
+// - KV-1 'Onion' Reentry Module (kv1Pod)
+// - KV-2 'Pea' Reentry Module (kv2Pod)
+// - KV-3 'Pomegranate' Reentry Module (kv3Pod)
+// - Mk2 Command Pod (Mk2Pod)
+
+//  KV-1
+@PART[kv1Pod]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+{
+  @author = Well
+  !mesh = DELETE
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Command/restock-pod-sphere-1
+    position = 0.0, 0.2, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+
+  node_stack_airlock = 0.0, 0.489547, -0.803417, 0.0, 0.339048, -0.940769, 0
+
+  MODULE
+  {
+    name = ModulePartVariants
+    useMultipleDragCubes = false
+    baseVariant = Green
+
+    VARIANT
+    {
+      name = Bare
+      displayName = #LOC_Restock_variant-pod_bare // Bare
+      themeName = White
+      primaryColor = #999999
+      secondaryColor = #aaaaaa
+      GAMEOBJECTS
+      {
+        Fabric = false
+      }
+    }
+    VARIANT
+    {
+      name = Green
+      displayName = #LOC_Restock_variant-pod_fabric_green // Green Padding
+      themeName = GrayAndOrange
+      primaryColor = #4c4f47
+      secondaryColor = #aaaaaa
+      GAMEOBJECTS
+      {
+        Fabric = true
+      }
+    }
+  }
+
+  @MODULE[ModuleAnchoredDecoupler] 
+  {
+    @anchorName = Vostok_Decoupler
+  }
+}
+
+//  KV-2
+@PART[kv2Pod]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+{
+  @author = Well
+  !mesh = DELETE
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Command/restock-pod-sphere-2
+    position = 0.0, 0.2, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+
+  node_stack_airlock = 0.0, 0.489547, -0.803417, 0.0, 0.339048, -0.940769, 0
+
+  MODULE
+  {
+    name = ModulePartVariants
+    useMultipleDragCubes = false
+    baseVariant = Beige
+
+    VARIANT
+    {
+      name = Bare
+      displayName = #LOC_Restock_variant-pod_bare // Bare
+      themeName = White
+      primaryColor = #999999
+      secondaryColor = #aaaaaa
+      GAMEOBJECTS
+      {
+        Fabric = false
+      }
+    }
+    VARIANT
+    {
+      name = Beige
+      displayName = #LOC_Restock_variant-pod_fabric_beige // Beige Padding
+      themeName = GrayAndOrange
+      primaryColor = #8c7656
+      secondaryColor = #aaaaaa
+      GAMEOBJECTS
+      {
+        Fabric = true
+      }
+    }
+  }
+
+  @MODULE[ModuleAnchoredDecoupler] 
+  {
+    @anchorName = Vostok_Decoupler
+  }
+}
+
+//  KV-3
+@PART[kv3Pod]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+{
+  @author = Well
+  !mesh = DELETE
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Command/restock-pod-sphere-3
+    position = 0.0, 0.2, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+
+  node_stack_airlock = 0.0, 0.489547, -0.803417, 0.0, 0.339048, -0.940769, 0
+
+  MODULE
+  {
+    name = ModulePartVariants
+    useMultipleDragCubes = false
+    baseVariant = White
+
+    VARIANT
+    {
+      name = Bare
+      displayName = #LOC_Restock_variant-pod_bare // Bare
+      themeName = White
+      primaryColor = #999999
+      secondaryColor = #aaaaaa
+      GAMEOBJECTS
+      {
+        Fabric = false
+      }
+    }
+    VARIANT
+    {
+      name = White
+      displayName = #LOC_Restock_variant-pod_fabric_white // White Padding
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #aaaaaa
+      GAMEOBJECTS
+      {
+        Fabric = true
+      }
+    }
+  }
+
+  @MODULE[ModuleAnchoredDecoupler] 
+  {
+    @anchorName = Vostok_Decoupler
+  }
+}
+
+// MK-2
+@PART[Mk2Pod]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+{
+  @author = Andrew Cassidy
+  !mesh = DELETE
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Command/restock-mk2-pod
+    position = 0.0, 0.25, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+  MODEL
+  {
+    model = ReStock/Assets/Command/restock-crewed-endcap-2
+    position = 0.0, 1.0, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+  MODEL
+  {
+    model = ReStock/Assets/Command/restock-hatch-common-round-grey-1
+    position = 0.0, -0.635, 0.0
+    scale = 1,1,1
+    rotation = 180, 0, 0
+  }
+
+  MODULE
+  {
+    name = ModulePartVariants
+    useMultipleDragCubes = false
+    baseVariant = Dark
+    VARIANT
+    {
+      name = Dark
+      displayName = #autoLOC_8007117
+      themeName = Dark
+      primaryColor = #4c4f47
+      secondaryColor =#4c4f47
+      GAMEOBJECTS
+      {
+        Mk2PodWhite = false
+        Mk2PodDark = true
+      }
+    }
+    VARIANT
+    {
+      name = White
+      displayName = #autoLOC_8007119
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        Mk2PodWhite = true
+        Mk2PodDark = false
+      }
+    }
+  }
+
+  @MODULE[FlagDecal]
+  {
+    @textureQuadName = Flag
+  }
+}
+

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

@@ -0,0 +1,118 @@
+// Patches applying art changes to the asteroid claw
+// Contents:
+// - Inflatable Airlock (InflatableAirlock)
+
+// Inflatable Airlock
+@PART[InflatableAirlock]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+{
+  @author = Andrew Cassidy
+
+  !MODEL {}
+  MODEL
+  {
+    model = ReStock/Assets/Coupling/restock-airlock-inflatable-1
+    position = 0.0, 0.0, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+  MODEL
+  {
+    model = ReStock/Assets/Command/restock-crewed-endcap-2
+    position = 0.0, 0.0, 0.0
+    scale = 1,-1,1
+    rotation = 0, 0, 0
+  }
+
+  !INTERNAL,* {}
+
+  INTERNAL
+  {
+    name = restock-airlock-1-IVA
+  }
+
+  @MODULE[ModuleAnimateGeneric]
+  {
+    @animationName = Deploy
+  }
+
+  fx_gasBurst_white = 0.0, 0.0, 0.0, 0.0, -1.0, 0.0, decouple
+  sound_decoupler_fire = decouple
+
+  MODULE
+  {
+    name = ModulePartVariants
+    useMultipleDragCubes = false
+    baseVariant = Compact
+
+    VARIANT
+    {
+      name = Compact
+      displayName = #LOC_Restock_variant-mounting_compact // Compact
+      themeName = White
+      primaryColor = #8c7656
+      secondaryColor = #555555
+      GAMEOBJECTS
+      {
+        Voskhod-Shroud = false
+      }
+    }
+    VARIANT
+    {
+      name = Mounted
+      displayName = #LOC_Restock_variant-mounting_mounted // Mounted
+      themeName = White
+      primaryColor = #8c7656
+      secondaryColor = #4c4f47
+      GAMEOBJECTS
+      {
+        Voskhod-Shroud = true
+      }
+    }
+  }
+
+  MODULE
+  {
+    name = ModuleDecouple
+    ejectionForce = 25
+    isOmniDecoupler = true
+    explosiveNodeID = bottom
+    staged = true
+    stagingEnabled = false
+  }
+
+  MODULE
+  {
+    name = ModuleColorChanger
+    shaderProperty = _EmissiveColor
+    animRate = 0.8
+    animState = false
+    useRate = true
+    toggleInEditor = 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/Props/Hatches/RS_HTCH_625.cfg

@@ -0,0 +1,12 @@
+// Restock Plus v1.2.0
+// Hatch - 0.625m bulkhead
+PROP
+{
+  name = RS_HTCH_625
+  MODEL
+  {
+    model = ReStock/Props/Hatches/RS_HTCH_625
+  }
+}
+
+proxy = 0, 0, 0,    0.6, 0.1, 0.6,   1, 0, 0

Distribution/Restock/GameData/ReStock/Props/Lights/RS_LGHT_Airlock_Green.cfg

@@ -0,0 +1,12 @@
+// Restock Plus v1.2.0
+// Light - Airlock pressurization indicator (green)
+PROP
+{
+  name = RS_LGHT_Airlock_Green
+  MODEL
+  {
+    model = ReStock/Props/Lights/RS_LGHT_Airlock_Green
+  }
+}
+
+proxy = 0, 0, 0,    0.10, 0.15, 0.07,   1, 0, 0

Distribution/Restock/GameData/ReStock/Props/Lights/RS_LGHT_Airlock_Red.cfg

@@ -0,0 +1,12 @@
+// Restock Plus v1.2.0
+// Light - Airlock pressurization indicator (green)
+PROP
+{
+  name = RS_LGHT_Airlock_Red
+  MODEL
+  {
+    model = ReStock/Props/Lights/RS_LGHT_Airlock_Red
+  }
+}
+
+proxy = 0, 0, 0,    0.10, 0.15, 0.07,   1, 0, 0

Distribution/Restock/GameData/ReStock/Props/Lights/RS_LGHT_Box_1.cfg

@@ -0,0 +1,29 @@
+// Restock Plus v1.2.0
+// Light - Airlock pressurization indicator (green)
+PROP
+{
+  name = RS_LGHT_Box_1
+  MODEL
+  {
+    model = ReStock/Props/Lights/RS_LGHT_Box_1
+  }
+
+  //MODULE
+  {
+    name = InternalButtonLight
+
+    buttonName = enable_BOXCOLLIDER
+    defaultValue = true
+
+    lightName = SpotLight
+    lightColor = 1,1,1
+    lightIntensityOn = 0.75
+    lightIntensityOff = 0
+
+    useButtonColor = true
+    buttonColorOn = 1,1,1
+    buttonColorOff = 0,0,0
+  }
+}
+
+proxy = 0, 0, 0,    0.06, 0.15, 0.07,   1, 0, 0

Distribution/Restock/GameData/ReStock/Spaces/Airlock/restock-airlock-1-IVA.cfg

@@ -0,0 +1,68 @@
+INTERNAL
+{
+	name = restock-airlock-1-IVA
+	MODEL
+	{
+		model = ReStock/Spaces/Airlock/restock-airlock-1-IVA
+	}
+	MODEL
+	{
+		model = ReStock/Spaces/Airlock/restock-airlock-1-IVA-mask
+	}
+	MODULE
+	{
+		name = InternalSeat
+		seatTransformName = seat1
+		allowCrewHelmet = false
+		portraitCameraName = seat1_camera
+	}
+	MODULE
+	{
+		name = InternalCameraSwitch
+		colliderTransformName = window_top_clicker
+		cameraTransformName = window_top_camera
+	}
+	
+	PROP
+	{
+		name = RS_LGHT_Box_1
+		position = -0.2032,0,-2.1108
+		rotation = 0.707107,0,0,0.7071066
+		scale = 1,1,1
+	}
+	PROP
+	{
+		name = RS_LGHT_Airlock_Green
+		position = 0,0.3212,-2.02
+		rotation = -0.707107,1.791241E-07,0.7071066,1.79124E-07
+		scale = 1,1,1
+	}
+	PROP
+	{
+		name = genericClusterSwitches05
+		position = -0.126,0.3299,-2.007
+		rotation = -0.9762959,-0.21644,5.317851E-07,-1.229346E-07
+		scale = 1,1,1
+	}
+	PROP
+	{
+		name = IndicatorPanel
+		position = 0.144,0.3119,-2.007
+		rotation = 2.38022E-07,-8.930404E-08,-0.9794683,-0.2015985
+		scale = 1,1,1
+	}
+	PROP
+	{
+		name = genericClusterSwitches05
+		position = -0.1641,0.3141,-2.007
+		rotation = 0,0,-0.9762959,0.2164401
+		scale = 1,1,1
+	}
+	PROP
+	{
+		name = RS_HTCH_625
+		position = 0,0,0
+		rotation = -0.7071068,0,0,0.7071068
+		scale = 1,1,1
+	}
+}

Distribution/Restock/changelog.txt

@@ -3,6 +3,14 @@ v1.2.0
 - New stock part replacements
  - Resources
    -FTE-1 Drain Valve (Andrew Cassidy): now has metal and warning stripe variants
+- New Making History part replacements
+ - Command
+  - KV-1 'Onion' Reentry Module (Andrew Cassidy): now has bare and green padded variants and a node for attaching the inflatable airlock.
+  - KV-2 'Pea' Reentry Module (Andrew Cassidy): now has bare and beige padded variants and a node for attaching the inflatable airlock.
+  - KV-3 'Pomegranate' Reentry Module (Andrew Cassidy): now has bare and white padded variants and a node for attaching the inflatable airlock.
+  - Mk2 Command Pod (Andrew Cassidy): Now has dark and white variants.
+ - Coupling
+  - Inflatable Airlock (Andrew Cassidy): now has built in decoupler and optional ring to connect seamlessly with KV-series pods. Has a new IVA.
 
 v1.1.2
 ------