diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-125-additional-1-n.tga b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-125-additional-1-n.tga new file mode 100644 index 00000000..37fb7f15 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-125-additional-1-n.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-125-additional-1.tga b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-125-additional-1.tga new file mode 100644 index 00000000..bd55b7ae Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-125-additional-1.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-125-revised-1-e.tga b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-125-revised-1-e.tga new file mode 100644 index 00000000..9f8a09ae Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-125-revised-1-e.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-125-revised-1-n.tga b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-125-revised-1-n.tga new file mode 100644 index 00000000..7853aebf Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-125-revised-1-n.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-ant-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-ant-1.mu index bdc9b9ae..0df1d17a 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-ant-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-ant-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-shroud-0625-1-n.tga b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-shroud-0625-1-n.tga new file mode 100644 index 00000000..4f75f875 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-shroud-0625-1-n.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-shroud-0625-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-shroud-0625-1.dds deleted file mode 100644 index a728df0b..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-shroud-0625-1.dds and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-shroud-0625-1.tga b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-shroud-0625-1.tga new file mode 100644 index 00000000..39cbdede Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-shroud-0625-1.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-shroud-0625-3-n.tga b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-shroud-0625-3-n.tga new file mode 100644 index 00000000..be8c4a25 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-shroud-0625-3-n.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-shroud-0625-3.tga b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-shroud-0625-3.tga new file mode 100644 index 00000000..1c68f475 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-shroud-0625-3.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-shroud-125-1-n.tga b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-shroud-125-1-n.tga new file mode 100644 index 00000000..c0b51ce6 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-shroud-125-1-n.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-shroud-125-1.tga b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-shroud-125-1.tga new file mode 100644 index 00000000..ee9adeba Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-shroud-125-1.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-spark-1-e.tga b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-spark-1-e.tga new file mode 100644 index 00000000..8fa0aa30 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-spark-1-e.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-spark-1-n.tga b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-spark-1-n.tga new file mode 100644 index 00000000..a15c99db Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-spark-1-n.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-spark-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-spark-1.dds deleted file mode 100644 index 3bd8ef67..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-spark-1.dds and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-spark-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-spark-1.mu index 09c14a31..4e94821c 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-spark-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-spark-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-spark-1.tga b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-spark-1.tga new file mode 100644 index 00000000..67e4b60b Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-spark-1.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-swivel-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-swivel-1.mu index 879500a2..2eeff231 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-swivel-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-swivel-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-terrier-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-terrier-1.mu index 4d0cfaa1..0ab9340d 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-terrier-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-terrier-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-1-n.tga b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-1-n.tga index 20d2acd1..9e9260ff 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-1-n.tga and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-1-n.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-1.mu b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-1.mu index 81c66d1b..880b14f8 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-1.tga b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-1.tga index 788789e7..6ab22f51 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-1.tga and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-1.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-2-n.tga b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-2-n.tga index 6d8f52c3..f505c639 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-2-n.tga and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-2-n.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-2.tga b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-2.tga index e8f83a0b..e8d5074c 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-2.tga and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-2.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-endcaps-1-n.tga b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-endcaps-1-n.tga index d3fa642c..514f89ac 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-endcaps-1-n.tga and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-endcaps-1-n.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-endcaps-1.tga b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-endcaps-1.tga index 634dc590..151816ff 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-endcaps-1.tga and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-endcaps-1.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-0625.cfg b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-0625.cfg index 77a49ac7..40d50018 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-0625.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-0625.cfg @@ -76,6 +76,41 @@ @fxOffset = 0, 0, 0 } !MODULE[ModulePartVariants] {} + MODULE + { + name = ModulePartVariants + useMultipleDragCubes = false + baseVariant = Metallic + + VARIANT + { + name = Metallic + displayName = #LOC_Restock_variant-surface_metal + themeName = Metal + primaryColor = #6f6e6d + secondaryColor = #6f6e6d + GAMEOBJECTS + { + ShroudAntWhite = false + ShroudAntMetal = true + + } + } + VARIANT + { + name = White + displayName = #autoLOC_8007119 + themeName = White + primaryColor = #ffffff + secondaryColor = #ffffff + GAMEOBJECTS + { + ShroudAntWhite = true + ShroudAntMetal = false + + } + } + } !MODULE[FXModuleAnimateThrottle] {} MODULE { @@ -558,6 +593,13 @@ AdditionalColliders = false Shroud = true ShroudSparkCompact = false + + 625BoattailWhite = false + 625BoattailOrange = true + ShroudWhite = false + ShroudOrange = true + ShroudSparkWhite = false + ShroudSparkOrange = true } } VARIANT @@ -580,6 +622,12 @@ AdditionalColliders = true Shroud = false ShroudSparkCompact = false + 625BoattailWhite = false + 625BoattailOrange = true + ShroudWhite = false + ShroudOrange = true + ShroudSparkWhite = false + ShroudSparkOrange = true } } VARIANT @@ -602,6 +650,97 @@ AdditionalColliders = true Shroud = false ShroudSparkCompact = true + 625BoattailWhite = false + 625BoattailOrange = true + ShroudWhite = false + ShroudOrange = true + ShroudSparkWhite = false + ShroudSparkOrange = true + } + } + VARIANT + { + name = Size0_Alternate + displayName = #LOC_Restock_variant-engine_size0 + primaryColor = #999999 + secondaryColor = #f69449 + GAMEOBJECTS + { + SparkBasic = true + CylBot001 = false + CylBot002 = false + CylBot003 = true + CylBot004 = true + CylBot005 = false + CylBot006 = false + SparkCompact = false + SparkBoattail = false + AdditionalColliders = false + Shroud = true + ShroudSparkCompact = false + + 625BoattailWhite = true + 625BoattailOrange = false + ShroudWhite = true + ShroudOrange = false + ShroudSparkWhite = true + ShroudSparkOrange = false + } + } + VARIANT + { + name = Boattail_Alternate + displayName = #LOC_Restock_variant-engine_boattail + primaryColor = #ffffff + secondaryColor = #f69449 + GAMEOBJECTS + { + SparkBasic = false + CylBot001 = false + CylBot002 = false + CylBot003 = false + CylBot004 = false + CylBot005 = true + CylBot006 = true + SparkCompact = false + SparkBoattail = true + AdditionalColliders = true + Shroud = false + ShroudSparkCompact = false + 625BoattailWhite = true + 625BoattailOrange = false + ShroudWhite = true + ShroudOrange = false + ShroudSparkWhite = true + ShroudSparkOrange = false + } + } + VARIANT + { + name = Compact_Alternate + displayName = #LOC_Restock_variant-engine_compact + primaryColor = #999999 + secondaryColor = #999999 + GAMEOBJECTS + { + SparkBasic = false + CylBot001 = true + CylBot002 = true + CylBot003 = false + CylBot004 = false + CylBot005 = false + CylBot006 = false + SparkCompact = true + SparkBoattail = false + AdditionalColliders = true + Shroud = false + ShroudSparkCompact = true + 625BoattailWhite = true + 625BoattailOrange = false + ShroudWhite = true + ShroudOrange = false + ShroudSparkWhite = true + ShroudSparkOrange = false } } } diff --git a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-125.cfg b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-125.cfg index bad66c1c..b4e77fbd 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-125.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-125.cfg @@ -693,6 +693,13 @@ LV_909_Compact = false ShortShroud = true TallShroud = false + + ShortShroudWhite = true + TallShroudWhite = true + Frame_Boat = true + TallShroudOrange = false + ShortShroudOrange = false + Frame_Boat_Orange = false } } VARIANT @@ -708,6 +715,13 @@ LV_909_Compact = false ShortShroud = false TallShroud = false + + ShortShroudWhite = true + TallShroudWhite = true + Frame_Boat = true + TallShroudOrange = false + ShortShroudOrange = false + Frame_Boat_Orange = false } } VARIANT @@ -723,6 +737,79 @@ LV_909_Compact = true ShortShroud = false TallShroud = true + + ShortShroudWhite = true + TallShroudWhite = true + Frame_Boat = true + TallShroudOrange = false + ShortShroudOrange = false + Frame_Boat_Orange = false + } + } + VARIANT + { + name = Size1_Alternate + displayName = #LOC_Restock_variant-engine_size1 + primaryColor = #999999 + secondaryColor = #ffb80c + GAMEOBJECTS + { + LV_909_Boattail = false + LV_909_Basic = true + LV_909_Compact = false + ShortShroud = true + TallShroud = false + + ShortShroudWhite = false + TallShroudWhite = false + Frame_Boat = false + TallShroudOrange = true + ShortShroudOrange = true + Frame_Boat_Orange = true + } + } + VARIANT + { + name = Boattail_Alternate + displayName = #LOC_Restock_variant-engine_boattail + primaryColor = #ffffff + secondaryColor = #ffb80c + GAMEOBJECTS + { + LV_909_Boattail = true + LV_909_Basic = false + LV_909_Compact = false + ShortShroud = false + TallShroud = false + + ShortShroudWhite = false + TallShroudWhite = false + Frame_Boat = false + TallShroudOrange = true + ShortShroudOrange = true + Frame_Boat_Orange = true + } + } + VARIANT + { + name = Compact_Alternate + displayName = #LOC_Restock_variant-engine_compact + primaryColor = #999999 + secondaryColor = #999999 + GAMEOBJECTS + { + LV_909_Boattail = false + LV_909_Basic = false + LV_909_Compact = true + ShortShroud = false + TallShroud = true + + ShortShroudWhite = false + TallShroudWhite = false + Frame_Boat = false + TallShroudOrange = true + ShortShroudOrange = true + Frame_Boat_Orange = true } } } @@ -758,12 +845,7 @@ secondaryColor = #f49841 GAMEOBJECTS { - ShortShroudWhite = false - ShortShroudOrange = true - TallShroudWhite = false - TallShroudOrange = true - Frame_Boat = false - Frame_Boat_Orange = true + } } } @@ -1001,6 +1083,13 @@ LV_T30_Boattail = false fairing = true ShroudT30_Compact = false + + fairingWhite = true + ShroudT30_CompactWhite = true + LV_T30_Boat = true + fairingOrange = false + ShroudT30_CompactOrange = false + LV_T30_BoatOrange = false } } VARIANT @@ -1016,6 +1105,13 @@ LV_T30_Boattail = true fairing = false ShroudT30_Compact = false + + fairingWhite = true + ShroudT30_CompactWhite = true + LV_T30_Boat = true + fairingOrange = false + ShroudT30_CompactOrange = false + LV_T30_BoatOrange = false } } VARIANT @@ -1031,50 +1127,83 @@ LV_T30_Boattail = false fairing = false ShroudT30_Compact = true + + fairingWhite = true + ShroudT30_CompactWhite = true + LV_T30_Boat = true + fairingOrange = false + ShroudT30_CompactOrange = false + LV_T30_BoatOrange = false } } - } - MODULE - { - name = ModulePartVariants - useMultipleDragCubes = false - baseVariant = White - VARIANT { - name = White - displayName = #autoLOC_8007119 - themeName = White - primaryColor = #ffffff - secondaryColor = #ffffff + name = Size1_Alternate + displayName = #LOC_Restock_variant-engine_size1 + primaryColor = #999999 + secondaryColor = #ffb80c GAMEOBJECTS { - fairingWhite = true - fairingOrange = false - ShroudT30_CompactWhite = true - ShroudT30_CompactOrange = false - LV_T30_Boat = true - LV_T30_BoatOrange = false + LV_T30_Basic = true + LV_T30_Compact = false + LV_T30_Boattail = false + fairing = true + ShroudT30_Compact = false + + fairingWhite = false + ShroudT30_CompactWhite = false + LV_T30_Boat = false + fairingOrange = true + ShroudT30_CompactOrange = true + LV_T30_BoatOrange = true } } VARIANT { - name = GrayAndOrange - displayName = #autoLOC_8007121 - themeName = GrayAndOrange - primaryColor = #4c4f47 - secondaryColor = #f49841 + name = Boattail_Alternate + displayName = #LOC_Restock_variant-engine_boattail + primaryColor = #ffffff + secondaryColor = #ffb80c GAMEOBJECTS { + LV_T30_Basic = false + LV_T30_Compact = false + LV_T30_Boattail = true + fairing = false + ShroudT30_Compact = false + fairingWhite = false - fairingOrange = true ShroudT30_CompactWhite = false + LV_T30_Boat = false + fairingOrange = true ShroudT30_CompactOrange = true + LV_T30_BoatOrange = true + } + } + VARIANT + { + name = Compact_Alternate + displayName = #LOC_Restock_variant-engine_compact + primaryColor = #999999 + secondaryColor = #999999 + GAMEOBJECTS + { + LV_T30_Basic = false + LV_T30_Compact = true + LV_T30_Boattail = false + fairing = false + ShroudT30_Compact = true + + fairingWhite = false + ShroudT30_CompactWhite = false LV_T30_Boat = false + fairingOrange = true + ShroudT30_CompactOrange = true LV_T30_BoatOrange = true } } } + @MODULE[ModuleEngines] { @name = ModuleEnginesFX @@ -1299,6 +1428,13 @@ EngineBoattail = false fairing = true ShroudT45_Compact = false + + fairingWhite = true + ShroudT45_CompactWhite = true + Frame_Boat = true + fairingOrange = false + ShroudT45_CompactOrange = false + Frame_BoatOrange = false } } VARIANT @@ -1320,6 +1456,13 @@ EngineBoattail = true fairing = false ShroudT45_Compact = false + + fairingWhite = true + ShroudT45_CompactWhite = true + Frame_Boat = true + fairingOrange = false + ShroudT45_CompactOrange = false + Frame_BoatOrange = false } } VARIANT @@ -1341,50 +1484,102 @@ EngineBoattail = false fairing = false ShroudT45_Compact = true + + fairingWhite = true + ShroudT45_CompactWhite = true + Frame_Boat = true + fairingOrange = false + ShroudT45_CompactOrange = false + Frame_BoatOrange = false } } - } - MODULE - { - name = ModulePartVariants - useMultipleDragCubes = false - baseVariant = White - VARIANT { - name = White - displayName = #autoLOC_8007119 - themeName = White - primaryColor = #ffffff - secondaryColor = #ffffff + name = Size1_Alternate + displayName = #LOC_Restock_variant-engine_size1 + primaryColor = #999999 + secondaryColor = #ffb80c GAMEOBJECTS { - fairingWhite = true - fairingOrange = false - ShroudT45_CompactWhite = true - ShroudT45_CompactOrange = false - Frame_Boat = true - Frame_BoatOrange = false + LV_T45_Boattail = false + LV_T45_Basic = true + LV_T45_Compact = false + T45_Piston001 = true + T45_Piston002 = true + T45_Piston003 = false + T45_Piston004 = false + Engine = true + EngineBoattail = false + fairing = true + ShroudT45_Compact = false + + fairingWhite = false + ShroudT45_CompactWhite = false + Frame_Boat = false + fairingOrange = true + ShroudT45_CompactOrange = true + Frame_BoatOrange = true } } VARIANT { - name = GrayAndOrange - displayName = #autoLOC_8007121 - themeName = GrayAndOrange - primaryColor = #4c4f47 - secondaryColor = #f49841 + name = Boattail_Alternate + displayName = #LOC_Restock_variant-engine_boattail + primaryColor = #ffffff + secondaryColor = #ffb80c GAMEOBJECTS { + LV_T45_Boattail = true + LV_T45_Basic = false + LV_T45_Compact = false + T45_Piston001 = false + T45_Piston002 = false + T45_Piston003 = false + T45_Piston004 = false + Engine = false + EngineBoattail = true + fairing = false + ShroudT45_Compact = false + fairingWhite = false - fairingOrange = true ShroudT45_CompactWhite = false + Frame_Boat = false + fairingOrange = true ShroudT45_CompactOrange = true + Frame_BoatOrange = true + + } + } + VARIANT + { + name = Compact_Alternate + displayName = #LOC_Restock_variant-engine_compact + primaryColor = #999999 + secondaryColor = #999999 + GAMEOBJECTS + { + LV_T45_Boattail = false + LV_T45_Basic = false + LV_T45_Compact = true + T45_Piston001 = false + T45_Piston002 = false + T45_Piston003 = true + T45_Piston004 = true + Engine = true + EngineBoattail = false + fairing = false + ShroudT45_Compact = true + + fairingWhite = false + ShroudT45_CompactWhite = false Frame_Boat = false + fairingOrange = true + ShroudT45_CompactOrange = true Frame_BoatOrange = true } } } + @MODULE[ModuleJettison] { @jettisonName = fairing,ShroudT45_Compact diff --git a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-srb-0625.cfg b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-srb-0625.cfg index 14b217d0..398d9910 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-srb-0625.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-srb-0625.cfg @@ -4,7 +4,7 @@ // - F3S0 'Shrimp' SRB () // FM1 'Mite' SRB -@PART[] +@PART[SRBTBD] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -168,7 +168,7 @@ } // F3S0 'Shrimp' SRB -@PART[] +@PART[SRBTBD] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-srb-25.cfg b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-srb-25.cfg index 7183be03..4afd6473 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-srb-25.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-srb-25.cfg @@ -4,7 +4,7 @@ // - S2-33 'Clydesdale' SRB () // S2-17 'Thoroughbred' SRB -@PART[] +@PART[SRBTBD] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -168,7 +168,7 @@ } // S2-33 'Clydesdale' SRB SRB -@PART[] +@PART[SRBTBD] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/PatchesMH/Aero/restock-mh-nosecones.cfg b/Distribution/Restock/GameData/ReStock/PatchesMH/Aero/restock-mh-nosecones.cfg index b1b27522..bf5f5efb 100644 --- a/Distribution/Restock/GameData/ReStock/PatchesMH/Aero/restock-mh-nosecones.cfg +++ b/Distribution/Restock/GameData/ReStock/PatchesMH/Aero/restock-mh-nosecones.cfg @@ -2,7 +2,7 @@ // Contents: - () -@PART[] +@PART[tdbCone] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/PatchesMH/Engine/restock-mh-engines-srb-1875.cfg b/Distribution/Restock/GameData/ReStock/PatchesMH/Engine/restock-mh-engines-srb-1875.cfg index d611f5fc..3406949e 100644 --- a/Distribution/Restock/GameData/ReStock/PatchesMH/Engine/restock-mh-engines-srb-1875.cfg +++ b/Distribution/Restock/GameData/ReStock/PatchesMH/Engine/restock-mh-engines-srb-1875.cfg @@ -3,7 +3,7 @@ // - THK 'Pollux' SRB () // THK 'Pollux' SRB -@PART[] +@PART[tdbSRB] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/changelog.txt b/Distribution/Restock/changelog.txt index 9b914702..e76d84b1 100644 --- a/Distribution/Restock/changelog.txt +++ b/Distribution/Restock/changelog.txt @@ -110,6 +110,8 @@ - Fixed Twin Boar flag being on wrong side compared to original model - Tweaked Nerv plume to be prettier - Tweaked mesh normals on Nerv shroud to be prettier + - 0.625m engine revisions + - Engines now have White and Metal surface variants that affect shrouds and boattails - 1.25m engine revisions - Repainted legacy Porkjet boattails - Terrier now uses a MLI texture on part of its Basic variant diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-glow-basic-1.tga b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-glow-basic-1.tga index a586f3ad..dfbf5c93 100644 Binary files a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-glow-basic-1.tga and b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-glow-basic-1.tga differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-shroud-0625-2-n.tga b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-shroud-0625-2-n.tga new file mode 100644 index 00000000..99282b98 Binary files /dev/null and b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-shroud-0625-2-n.tga differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-shroud-0625-2.tga b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-shroud-0625-2.tga new file mode 100644 index 00000000..ed8492de Binary files /dev/null and b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-shroud-0625-2.tga differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-shroud-0625-3-n.tga b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-shroud-0625-3-n.tga new file mode 100644 index 00000000..be8c4a25 Binary files /dev/null and b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-shroud-0625-3-n.tga differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-shroud-0625-3.tga b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-shroud-0625-3.tga new file mode 100644 index 00000000..1c68f475 Binary files /dev/null and b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-shroud-0625-3.tga differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-torch-1-e.tga b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-torch-1-e.tga new file mode 100644 index 00000000..7fcd30d0 Binary files /dev/null and b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-torch-1-e.tga differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-torch-1-n.tga b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-torch-1-n.tga new file mode 100644 index 00000000..7d1ee73a Binary files /dev/null and b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-torch-1-n.tga differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-torch-1.dds b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-torch-1.dds deleted file mode 100644 index 150ce4cc..00000000 Binary files a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-torch-1.dds and /dev/null differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-torch-1.mu b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-torch-1.mu index 92ef1439..cee5d7c4 100644 Binary files a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-torch-1.mu and b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-torch-1.mu differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-torch-1.tga b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-torch-1.tga new file mode 100644 index 00000000..d0e395cf Binary files /dev/null and b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-torch-1.tga differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-engine-torch.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-engine-torch.cfg index 38d6b3ee..26cedb47 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-engine-torch.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-engine-torch.cfg @@ -192,6 +192,13 @@ PART CylLower004 = false ShroudTorchBasic = true ShroudTorchCompact = false + + ShroudTorchCompactMetal = true + ShroudTorchCompactWhite = false + ShroudTorchBasicMetal = true + ShroudTorchBasicWhite = false + BoattailWhite = false + Boattail = true } } VARIANT @@ -215,6 +222,13 @@ PART CylLower004 = false ShroudTorchBasic = false ShroudTorchCompact = false + + ShroudTorchCompactMetal = true + ShroudTorchCompactWhite = false + ShroudTorchBasicMetal = true + ShroudTorchBasicWhite = false + BoattailWhite = false + Boattail = true } } VARIANT @@ -238,6 +252,103 @@ PART CylLower004 = true ShroudTorchBasic = false ShroudTorchCompact = true + + ShroudTorchCompactMetal = true + ShroudTorchCompactWhite = false + ShroudTorchBasicMetal = true + ShroudTorchBasicWhite = false + BoattailWhite = false + Boattail = true + } + } + VARIANT + { + name = Size0_Alternate + displayName = #LOC_Restock_variant-engine_size0 + primaryColor = #999999 + secondaryColor = #f69449 + GAMEOBJECTS + { + Torch_0625 = true + Torch_Boattail = false + Torch_Compact = false + CylUpper001 = true + CylUpper002 = true + CylUpper003 = false + CylUpper004 = false + CylLower001 = true + CylLower002 = true + CylLower003 = false + CylLower004 = false + ShroudTorchBasic = true + ShroudTorchCompact = false + + ShroudTorchCompactMetal = false + ShroudTorchCompactWhite = true + ShroudTorchBasicMetal = false + ShroudTorchBasicWhite = true + BoattailWhite = true + Boattail = false + } + } + VARIANT + { + name = Boattail_Alternate + displayName = #LOC_Restock_variant-engine_boattail + primaryColor = #ffffff + secondaryColor = #f69449 + GAMEOBJECTS + { + Torch_0625 = false + Torch_Boattail = true + Torch_Compact = false + CylUpper001 = true + CylUpper002 = true + CylUpper003 = false + CylUpper004 = false + CylLower001 = true + CylLower002 = true + CylLower003 = false + CylLower004 = false + ShroudTorchBasic = false + ShroudTorchCompact = false + + ShroudTorchCompactMetal = false + ShroudTorchCompactWhite = true + ShroudTorchBasicMetal = false + ShroudTorchBasicWhite = true + BoattailWhite = true + Boattail = false + } + } + VARIANT + { + name = Compact_Alternate + displayName = #LOC_Restock_variant-engine_compact + primaryColor = #999999 + secondaryColor = #999999 + GAMEOBJECTS + { + Torch_0625 = false + Torch_Boattail = false + Torch_Compact = true + CylUpper001 = false + CylUpper002 = false + CylUpper003 = true + CylUpper004 = true + CylLower001 = false + CylLower002 = false + CylLower003 = true + CylLower004 = true + ShroudTorchBasic = false + ShroudTorchCompact = true + + ShroudTorchCompactMetal = false + ShroudTorchCompactWhite = true + ShroudTorchBasicMetal = false + ShroudTorchBasicWhite = true + BoattailWhite = true + Boattail = false } } } diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/125/restock-engine-pug.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/125/restock-engine-pug.cfg index cb72b83e..a4f0fdce 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/125/restock-engine-pug.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/125/restock-engine-pug.cfg @@ -152,6 +152,13 @@ PART LV_303_Compact = false Shroud = true Shroud_Compact = false + + ShroudWhite = true + ShroudOrange = false + Shroud_CompactWhite = true + Shroud_CompactOrange = false + Frame_Boat = true + Frame_BoatOrange = false } } VARIANT @@ -167,6 +174,13 @@ PART LV_303_Compact = false Shroud = false Shroud_Compact = false + + ShroudWhite = true + ShroudOrange = false + Shroud_CompactWhite = true + Shroud_CompactOrange = false + Frame_Boat = true + Frame_BoatOrange = false } } VARIANT @@ -182,41 +196,73 @@ PART LV_303_Compact = true Shroud = false Shroud_Compact = true + + ShroudWhite = true + ShroudOrange = false + Shroud_CompactWhite = true + Shroud_CompactOrange = false + Frame_Boat = true + Frame_BoatOrange = false + } + } + VARIANT + { + name = Size1Alternate + displayName = #LOC_Restock_variant-engine_size1 + primaryColor = #999999 + secondaryColor = #ffb80c + GAMEOBJECTS + { + LV_303 = true + LV_303_Boattail = false + LV_303_Compact = false + Shroud = true + Shroud_Compact = false + + ShroudWhite = false + ShroudOrange = true + Shroud_CompactWhite = false + Shroud_CompactOrange = true + Frame_Boat = false + Frame_BoatOrange = true } } - } - MODULE - { - name = ModulePartVariants - useMultipleDragCubes = false - baseVariant = White - VARIANT { - name = White - displayName = #autoLOC_8007119 - themeName = White + name = Boattail_Alternate + displayName = #LOC_Restock_variant-engine_boattail primaryColor = #ffffff - secondaryColor = #ffffff + secondaryColor = #ffb80c GAMEOBJECTS { - ShroudWhite = true - ShroudOrange = false - Shroud_CompactWhite = true - Shroud_CompactOrange = false - Frame_Boat = true - Frame_BoatOrange = false + LV_303 = false + LV_303_Boattail = true + LV_303_Compact = false + Shroud = false + Shroud_Compact = false + + ShroudWhite = false + ShroudOrange = true + Shroud_CompactWhite = false + Shroud_CompactOrange = true + Frame_Boat = false + Frame_BoatOrange = true } } VARIANT { - name = GrayAndOrange - displayName = #autoLOC_8007121 - themeName = GrayAndOrange - primaryColor = #4c4f47 - secondaryColor = #f49841 + name = Compact_Alternate + displayName = #LOC_Restock_variant-engine_compact + primaryColor = #999999 + secondaryColor = #999999 GAMEOBJECTS { + LV_303 = false + LV_303_Boattail = false + LV_303_Compact = true + Shroud = false + Shroud_Compact = true + ShroudWhite = false ShroudOrange = true Shroud_CompactWhite = false @@ -226,6 +272,7 @@ PART } } } + MODULE { name = ModuleJettison diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/125/restock-engine-valiant.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/125/restock-engine-valiant.cfg index b07312f0..ccdf0ce9 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/125/restock-engine-valiant.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/125/restock-engine-valiant.cfg @@ -190,6 +190,13 @@ PART Piston002Upper = true Piston003Upper = false Piston004Upper = false + + ShroudWhite = true + ShroudOrange = false + Shroud_CompactWhite = true + Shroud_CompactOrange = false + Frame_Boat = true + Frame_Boat_Orange = false } } VARIANT @@ -217,6 +224,13 @@ PART Piston002Upper = false Piston003Upper = false Piston004Upper = false + + ShroudWhite = true + ShroudOrange = false + Shroud_CompactWhite = true + Shroud_CompactOrange = false + Frame_Boat = true + Frame_Boat_Orange = false } } VARIANT @@ -244,41 +258,109 @@ PART Piston002Upper = false Piston003Upper = true Piston004Upper = true + + ShroudWhite = true + ShroudOrange = false + Shroud_CompactWhite = true + Shroud_CompactOrange = false + Frame_Boat = true + Frame_Boat_Orange = false + } + } + VARIANT + { + name = Size1_Alternate + displayName = #LOC_Restock_variant-engine_size1 + primaryColor = #999999 + secondaryColor = #ffb80c + GAMEOBJECTS + { + LV_T15 = true + LV_T15_Boattail = false + LV_T15_Compact = false + Shroud = true + Shroud_Compact = false + EngineCompact = false + Engine = true + MovingPartsCompactT15 = false + MovingParts = true + Piston001Lower = true + Piston002Lower = true + Piston003Lower = false + Piston004Lower = false + Piston001Upper = true + Piston002Upper = true + Piston003Upper = false + Piston004Upper = false + + ShroudWhite = false + ShroudOrange = true + Shroud_CompactWhite = false + Shroud_CompactOrange = true + Frame_Boat = false + Frame_Boat_Orange = true } } - } - MODULE - { - name = ModulePartVariants - useMultipleDragCubes = false - baseVariant = White - VARIANT { - name = White - displayName = #autoLOC_8007119 - themeName = White + name = Boattail_Alternate + displayName = #LOC_Restock_variant-engine_boattail primaryColor = #ffffff - secondaryColor = #ffffff + secondaryColor = #ffb80c GAMEOBJECTS { - ShroudWhite = true - ShroudOrange = false - Shroud_CompactWhite = true - Shroud_CompactOrange = false - Frame_Boat = true - Frame_Boat_Orange = false + LV_T15 = false + LV_T15_Boattail = true + LV_T15_Compact = false + Shroud = false + Shroud_Compact = false + EngineCompact = false + Engine = true + MovingPartsCompactT15 = false + MovingParts = false + Piston001Lower = false + Piston002Lower = false + Piston003Lower = false + Piston004Lower = false + Piston001Upper = false + Piston002Upper = false + Piston003Upper = false + Piston004Upper = false + + ShroudWhite = false + ShroudOrange = true + Shroud_CompactWhite = false + Shroud_CompactOrange = true + Frame_Boat = false + Frame_Boat_Orange = true } } VARIANT { - name = GrayAndOrange - displayName = #autoLOC_8007121 - themeName = GrayAndOrange - primaryColor = #4c4f47 - secondaryColor = #f49841 + name = Compact_Alternate + displayName = #LOC_Restock_variant-engine_compact + primaryColor = #999999 + secondaryColor = #999999 GAMEOBJECTS { + LV_T15 = false + LV_T15_Boattail = false + LV_T15_Compact = true + Shroud = false + Shroud_Compact = true + EngineCompact = true + Engine = false + MovingPartsCompactT15 = true + MovingParts = false + Piston001Lower = false + Piston002Lower = false + Piston003Lower = true + Piston004Lower = true + Piston001Upper = false + Piston002Upper = false + Piston003Upper = true + Piston004Upper = true + ShroudWhite = false ShroudOrange = true Shroud_CompactWhite = false @@ -288,6 +370,7 @@ PART } } } + MODULE { name = ModuleGimbal diff --git a/Distribution/RestockPlus/changelog.txt b/Distribution/RestockPlus/changelog.txt index ca2052fc..8b15cf3c 100644 --- a/Distribution/RestockPlus/changelog.txt +++ b/Distribution/RestockPlus/changelog.txt @@ -4,10 +4,10 @@ v0.2.0 - Phase 2 release - Changes to existing parts (as a result of KSP 1.8) - Redundant overlapping parts were removed - - Mallet SRB (0.625m) has been soft-deprecated and its assets moved into base ReStock - - Striker SRB (0.625m) has been soft-deprecated and its assets moved into base ReStock - - Anvil SRB (1.875m) has been soft-deprecated and its assets moved into base ReStock - - Protective Rocket Nose Mk18 (1.875m) has been soft-deprecated and its assets moved into base ReStock + - Mallet SRB (0.625m) has been soft-deprecated and its assets moved into base ReStock + - Striker SRB (0.625m) has been soft-deprecated and its assets moved into base ReStock + - Anvil SRB (1.875m) has been soft-deprecated and its assets moved into base ReStock + - Protective Rocket Nose Mk18 (1.875m) has been soft-deprecated and its assets moved into base ReStock - New Aero parts: - Miniature Rocket Nose (Nertea): 0.625m rocket nosecone (White and Metallic variants) - New Command parts @@ -62,12 +62,14 @@ v0.2.0 - Pegasus II Mobility Enhancer (Nertea): 2x size static ladder - Pegasus III Mobility Enhancer (Nertea): 4x size static ladder - Fixes and improvements - - 1.25m engine revisions - - Repainted legacy Porkjet boattails on Valiant and Pug - - Engines now have White/Grey and Orange surface variants that affect shrouds and boattails - - Added appropriate Orange/Dark/Metal variants to all stack Decouplers and Separators. Exact distribution depends on the size class - - Depth mask added to radial material bay and new RCS parts - - 3.75m battery now has surface attach capabilities (#648) + - 0.625m engine revisions + - Engines now have White and Metal surface variants that affect shrouds and boattails + - 1.25m engine revisions + - Repainted legacy Porkjet boattails on Valiant and Pug + - Engines now have White/Grey and Orange surface variants that affect shrouds and boattails + - Added appropriate Orange/Dark/Metal variants to all stack Decouplers and Separators. Exact distribution depends on the size class + - Depth mask added to radial material bay and new RCS parts + - 3.75m battery now has surface attach capabilities (#648) v0.1.4 ------