diff --git a/Assets/CineboxAndrew b/Assets/CineboxAndrew index 87a0c97f..24e08858 160000 --- a/Assets/CineboxAndrew +++ b/Assets/CineboxAndrew @@ -1 +1 @@ -Subproject commit 87a0c97ff011f35577d75a5aa17e227436cdc25f +Subproject commit 24e08858f7bbbfd69376f9cf01a8ea13b5c7639d diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-airlock-inflatable-1-shroud.mu b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-airlock-inflatable-1-shroud.mu deleted file mode 100644 index 1ac35f71..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-airlock-inflatable-1-shroud.mu and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-airlock-inflatable-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-airlock-inflatable-1.mu index 26b37d39..6956ab4c 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-airlock-inflatable-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-airlock-inflatable-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg b/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg index 667f1f3c..0c08437e 100644 --- a/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg +++ b/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg @@ -60,6 +60,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) diff --git a/Distribution/Restock/GameData/ReStock/PatchesMH/Command/restock-mh-command-pods.cfg b/Distribution/Restock/GameData/ReStock/PatchesMH/Command/restock-mh-command-pods.cfg index c1650064..26195ba0 100644 --- a/Distribution/Restock/GameData/ReStock/PatchesMH/Command/restock-mh-command-pods.cfg +++ b/Distribution/Restock/GameData/ReStock/PatchesMH/Command/restock-mh-command-pods.cfg @@ -17,13 +17,6 @@ scale = 1,1,1 rotation = 0, 0, 0 } - MODEL - { - model = ReStock/Assets/Coupling/restock-airlock-inflatable-1-shroud - position = 0.0, 0.489547, -0.803417 - scale = 1,1,1 - rotation = 70, 180, 0 - } node_stack_airlock = 0.0, 0.489547, -0.803417, 0.0, 0.339048, -0.940769, 0 @@ -63,18 +56,6 @@ { @anchorName = Vostok_Decoupler } - - MODULE - { - name = ModuleJettison - jettisonName = Voskhod-Shroud - bottomNodeName = airlock - isFairing = True - jettisonedObjectMass = 0.1 - jettisonForce = 5 - jettisonDirection = 0.0 0.339048 0.940769 - useMultipleDragCubes = true - } } // KV-2 @@ -90,13 +71,6 @@ scale = 1,1,1 rotation = 0, 0, 0 } - MODEL - { - model = ReStock/Assets/Coupling/restock-airlock-inflatable-1-shroud - position = 0.0, 0.489547, -0.803417 - scale = 1,1,1 - rotation = 70, 180, 0 - } node_stack_airlock = 0.0, 0.489547, -0.803417, 0.0, 0.339048, -0.940769, 0 @@ -136,18 +110,6 @@ { @anchorName = Vostok_Decoupler } - - MODULE - { - name = ModuleJettison - jettisonName = Voskhod-Shroud - bottomNodeName = airlock - isFairing = True - jettisonedObjectMass = 0.1 - jettisonForce = 5 - jettisonDirection = 0.0 0.339048 0.940769 - useMultipleDragCubes = true - } } // KV-3 @@ -163,13 +125,6 @@ scale = 1,1,1 rotation = 0, 0, 0 } - MODEL - { - model = ReStock/Assets/Coupling/restock-airlock-inflatable-1-shroud - position = 0.0, 0.489547, -0.803417 - scale = 1,1,1 - rotation = 70, 180, 0 - } node_stack_airlock = 0.0, 0.489547, -0.803417, 0.0, 0.339048, -0.940769, 0 @@ -209,16 +164,4 @@ { @anchorName = Vostok_Decoupler } - - MODULE - { - name = ModuleJettison - jettisonName = Voskhod-Shroud - bottomNodeName = airlock - isFairing = True - jettisonedObjectMass = 0.1 - jettisonForce = 5 - jettisonDirection = 0.0 0.339048 0.940769 - useMultipleDragCubes = true - } } \ No newline at end of file diff --git a/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-airlock.cfg b/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-airlock.cfg index 59d52c1e..2813a03f 100644 --- a/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-airlock.cfg +++ b/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-airlock.cfg @@ -25,13 +25,46 @@ 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 = Mounted + + 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 = false + staged = true + stagingEnabled = false } MODULE