diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-crewed-endcap-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-crewed-endcap-1.mu index 7f61dcc8..af3bc009 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-crewed-endcap-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-crewed-endcap-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-crewed-hatch-1-grey.dds b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-crewed-hatch-1-grey.dds index e2c42ff4..66275c01 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-crewed-hatch-1-grey.dds and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-crewed-hatch-1-grey.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-crewed-hatch-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-crewed-hatch-1-n.dds index 4aef65be..67bf515c 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-crewed-hatch-1-n.dds and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-crewed-hatch-1-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-crewed-hatch-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-crewed-hatch-1.dds index 78bff253..ea0d111b 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-crewed-hatch-1.dds and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-crewed-hatch-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-cupola-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-cupola-1.mu index 42fc092c..f1459125 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-cupola-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-cupola-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-cupola-lab-1-alt-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-cupola-lab-1-alt-n.dds new file mode 100644 index 00000000..6e43cbe2 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-cupola-lab-1-alt-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-cupola-lab-1-alt-n.tga b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-cupola-lab-1-alt-n.tga deleted file mode 100644 index cd469939..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-cupola-lab-1-alt-n.tga and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-cupola-lab-1-alt.dds b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-cupola-lab-1-alt.dds new file mode 100644 index 00000000..0ee4adfb Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-cupola-lab-1-alt.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-cupola-lab-1-alt.tga b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-cupola-lab-1-alt.tga deleted file mode 100644 index d32153a2..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-cupola-lab-1-alt.tga and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-cupola-lab-1-e.dds b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-cupola-lab-1-e.dds index 2a5a017b..06922cbb 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-cupola-lab-1-e.dds and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-cupola-lab-1-e.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-cupola-lab-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-cupola-lab-1-n.dds index b246cccc..805199fe 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-cupola-lab-1-n.dds and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-cupola-lab-1-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-endcap-crewed-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-endcap-crewed-1-n.dds index f055e631..a059f08c 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-endcap-crewed-1-n.dds and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-endcap-crewed-1-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-endcap-crewed-1-s.dds b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-endcap-crewed-1-s.dds index 2cafd846..29868efa 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-endcap-crewed-1-s.dds and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-endcap-crewed-1-s.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-endcap-crewed-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-endcap-crewed-1.dds index a9b13217..4dc7c376 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-endcap-crewed-1.dds and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-endcap-crewed-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-hatch-common-round-grey-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-hatch-common-round-grey-1.mu index f7c4b7cd..d4d4f04b 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-hatch-common-round-grey-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-hatch-common-round-grey-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-hatch-common-round-white-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-hatch-common-round-white-1.mu index 6b06ea23..64813261 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-hatch-common-round-white-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-hatch-common-round-white-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-hitchhiker-1-e.dds b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-hitchhiker-1-e.dds index e1170dd0..ea209b55 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-hitchhiker-1-e.dds and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-hitchhiker-1-e.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-hitchhiker-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-hitchhiker-1-n.dds index 6d0312ec..603fdde7 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-hitchhiker-1-n.dds and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-hitchhiker-1-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-hitchhiker-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-hitchhiker-1.dds index 0ee7f64d..435d790e 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-hitchhiker-1.dds and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-hitchhiker-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-hitchhiker-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-hitchhiker-1.mu index fc5c76cb..b81c51fe 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-hitchhiker-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-hitchhiker-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-lab-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-lab-1.mu index a5a011dd..dcb56265 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-lab-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-lab-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-3-pod-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-3-pod-1-n.dds index 5bcfcb66..f0ed082e 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-3-pod-1-n.dds and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-3-pod-1-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-3-pod-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-3-pod-1.dds index d2fb305b..01f3aa2d 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-3-pod-1.dds and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-3-pod-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-3-pod.mu b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-3-pod.mu index 7d03885f..f9202c7f 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-3-pod.mu and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-3-pod.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-lander-1-e.dds b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-lander-1-e.dds index 2bc7706e..2a3d4591 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-lander-1-e.dds and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-lander-1-e.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-lander-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-lander-1-n.dds index 370d3111..c88637f6 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-lander-1-n.dds and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-lander-1-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-lander-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-lander-1.dds index 97710884..2f78c651 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-lander-1.dds and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-lander-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-lander.mu b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-lander.mu index a44f7c32..1a6636ba 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-lander.mu and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-lander.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-pod-1-e.dds b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-pod-1-e.dds index 19766ae3..f720483b 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-pod-1-e.dds and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-pod-1-e.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-pod-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-pod-1-n.dds index daf87c98..de12da72 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-pod-1-n.dds and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-pod-1-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-pod-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-pod-1.dds index 9c5ceab0..7f8575fe 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-pod-1.dds and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-pod-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-pod.mu b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-pod.mu index c379d758..961d2ece 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-pod.mu and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-pod.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-1-e.dds b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-1-e.dds index bb010e04..32152a32 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-1-e.dds and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-1-e.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-1-n.dds index e8229f5f..9931b64a 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-1-n.dds and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-1-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-1.dds index 1ca142cb..4a658820 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-1.dds and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-2-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-2-n.dds index 15a0b52e..0e8a802a 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-2-n.dds and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-2-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-2.dds b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-2.dds index 1a25b363..9351561f 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-2.dds and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-2.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander.mu b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander.mu index 5039cf21..ebe8dd43 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander.mu and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Patches/Command/restock-command-pods.cfg b/Distribution/Restock/GameData/ReStock/Patches/Command/restock-command-pods.cfg index 7881dd35..57352d8c 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Command/restock-command-pods.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Command/restock-command-pods.cfg @@ -40,7 +40,7 @@ shaderProperty = _TintColor animRate = 0.8 animState = false - useRate = true + useRate = false toggleInEditor = false toggleInFlight = false unfocusedRange = 5 @@ -130,6 +130,44 @@ } } } + + @MODULE[ModuleColorChanger] + { + moduleID = hullLightColor + } + MODULE + { + name = ModuleRestockLinkedColorChanger + parentModuleID = hullLightColor + moduleID = fresnelLightColor + shaderProperty = _TintColor + animRate = 0.8 + animState = false + useRate = false + toggleInEditor = false + toggleInFlight = false + unfocusedRange = 5 + toggleAction = false + 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 + } + } } // Mk1-3 Pod @@ -192,6 +230,44 @@ } } } + + @MODULE[ModuleColorChanger] + { + moduleID = hullLightColor + } + MODULE + { + name = ModuleRestockLinkedColorChanger + parentModuleID = hullLightColor + moduleID = fresnelLightColor + shaderProperty = _TintColor + animRate = 1.6 + animState = false + useRate = false + toggleInEditor = false + toggleInFlight = false + unfocusedRange = 5 + toggleAction = false + redCurve + { + key = 0 0 0 3 + key = 1 1 0 0 + } + greenCurve + { + key = 0 0 0 1 + key = 1 0.95 1 0 + } + blueCurve + { + key = 0 0 0 0 + key = 1 0.62 1.5 0 + } + alphaCurve + { + key = 0 1 + } + } } // Mk1 Lander Can @@ -208,6 +284,44 @@ scale = 1,1,1 rotation = 0, 0, 0 } + + @MODULE[ModuleColorChanger] + { + moduleID = hullLightColor + } + MODULE + { + name = ModuleRestockLinkedColorChanger + parentModuleID = hullLightColor + moduleID = fresnelLightColor + shaderProperty = _TintColor + animRate = 0.8 + animState = false + useRate = false + toggleInEditor = false + toggleInFlight = false + unfocusedRange = 5 + toggleAction = false + 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 + } + } } // Mk2 Lander Can @@ -248,4 +362,42 @@ } } } + + @MODULE[ModuleColorChanger] + { + moduleID = hullLightColor + } + MODULE + { + name = ModuleRestockLinkedColorChanger + parentModuleID = hullLightColor + moduleID = fresnelLightColor + shaderProperty = _TintColor + animRate = 0.8 + animState = false + useRate = false + toggleInEditor = false + toggleInFlight = false + unfocusedRange = 5 + toggleAction = false + 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 + } + } } diff --git a/Distribution/Restock/GameData/ReStock/Patches/Command/restock-utility-pods.cfg b/Distribution/Restock/GameData/ReStock/Patches/Command/restock-utility-pods.cfg index a3960d0d..6c592a97 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Command/restock-utility-pods.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Command/restock-utility-pods.cfg @@ -42,7 +42,7 @@ shaderProperty = _TintColor animRate = 0.8 animState = false - useRate = true + useRate = false toggleInEditor = false toggleInFlight = false unfocusedRange = 5 @@ -69,7 +69,6 @@ } } -} // Hitchhiker @PART[crewCabin]:HAS[~RestockIgnore[*]]:FOR[ReStock] @@ -98,4 +97,42 @@ scale = 1,1,1 rotation = 0, 0, 0 } + + @MODULE[ModuleColorChanger] + { + moduleID = hullLightColor + } + MODULE + { + name = ModuleRestockLinkedColorChanger + parentModuleID = hullLightColor + moduleID = fresnelLightColor + shaderProperty = _TintColor + animRate = 0.8 + animState = false + useRate = false + toggleInEditor = false + toggleInFlight = false + unfocusedRange = 5 + toggleAction = false + 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 + } + } } diff --git a/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-125.cfg b/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-125.cfg index bd4a6351..c714e633 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-125.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-125.cfg @@ -202,6 +202,7 @@ { name = ModuleColorChanger shaderProperty = _EmissiveColor + moduleID = hullLightColor animRate = 0.8 animState = false useRate = true @@ -234,6 +235,42 @@ key = 0 1 } } + + MODULE + { + name = ModuleRestockLinkedColorChanger + parentModuleID = hullLightColor + moduleID = fresnelLightColor + shaderProperty = _TintColor + animRate = 0.8 + animState = false + useRate = false + toggleInEditor = false + toggleInFlight = false + unfocusedRange = 5 + toggleAction = false + 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 + } + } +} + } // 1.25m radial attach point