diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-mainsail-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-mainsail-1.mu index a541f280..9781a95e 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-mainsail-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-mainsail-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-clydesdale-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-clydesdale-1.mu index 0d6eccc9..b526b5b4 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-clydesdale-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-clydesdale-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-thoroughbred-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-thoroughbred-1.mu index 64165515..52148546 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-thoroughbred-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-thoroughbred-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-endcap-fueltank-0625-grey.mu b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-endcap-fueltank-0625-grey.mu new file mode 100644 index 00000000..ea29c998 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-endcap-fueltank-0625-grey.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-endcap-fueltank-125-orange.mu b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-endcap-fueltank-125-orange.mu new file mode 100644 index 00000000..528c35e7 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-endcap-fueltank-125-orange.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-endcap-fueltank-1875-grey.mu b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-endcap-fueltank-1875-grey.mu new file mode 100644 index 00000000..3bb86476 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-endcap-fueltank-1875-grey.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-375.cfg b/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-375.cfg index b35c35f1..09cc3954 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-375.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-375.cfg @@ -11,6 +11,12 @@ { model = ReStock/Assets/FuelTank/restock-nosecone-375-2 } + MODEL + { + model = ReStock/Assets/FuelTank/restock-endcap-structural-375-orange + scale = 1.0, -1.0, 1.0 + position = 0.0, 0.0, 0.0 + } !MODULE[ModulePartVariants] {} MODULE { 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 0b45c39f..74728c70 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 @@ -423,7 +423,7 @@ Var_UpperGimbals = true Var_LowerGimbals = true Fairing = false - Fairing25 = true + Fairing25 = false Fairing25_Boat = false FairingCompact = true } @@ -439,7 +439,7 @@ } @MODULE[ModuleJettison] { - @jettisonName = Fairing,Fairing25,FairingCompact + @jettisonName = Fairing,Fairing25,FairingCompact,Fairing25_Boat useMultipleDragCubes = false } @MODULE[ModuleGimbal] diff --git a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-25.cfg b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-25.cfg index 6293836f..72a9ffcc 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-25.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-25.cfg @@ -357,8 +357,8 @@ Mainsail_Shroud_CompactOrange = false fairingWhite = false fairingOrange = false - Mainsail_BoattailMeshWhite = true - Mainsail_BoattailMeshOrange = false + Mainsail_BoattailMeshWhite = false + Mainsail_BoattailMeshOrange = true } } VARIANT 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 ee1c5297..e91a045f 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 @@ -214,9 +214,9 @@ !fx_exhaustFlame_white = DELETE !fx_exhaustSparks_yellow = DELETE !fx_smokeTrail_large = DELETE - !sound_rocket_hard = running - !sound_vent_soft = disengage - !sound_explosion_low = flameout + !sound_rocket_hard = DELETE + !sound_vent_soft = DELETE + !sound_explosion_low = DELETE EFFECTS { @@ -233,12 +233,6 @@ } flameout { - PREFAB_PARTICLE - { - prefabName = fx_exhaustSparks_yellow - transformName = thrustTransform - oneShot = true - } AUDIO { channel = Ship @@ -292,7 +286,9 @@ @MODULE[ModuleEngines] { @name = ModuleEnginesFX - %runningEffectName = fx-clydesdale-running + @runningEffectName = fx-clydesdale-running + + !directThrottleEffectName = DELETE } @MODULE[ModuleGimbal] { diff --git a/Distribution/Restock/changelog.txt b/Distribution/Restock/changelog.txt index 2c87d684..e133a12c 100644 --- a/Distribution/Restock/changelog.txt +++ b/Distribution/Restock/changelog.txt @@ -132,6 +132,7 @@ - Rotated collider of 1.25m nosecone 15 degrees - Added Spanish localization of Restock strings (thanks Niako) - Fixed HG-55 animation not deploying all the way + - Fixed an issue with the Vector's shroud in Compact mode - Fixed legacy part folders being present in the blacklist file diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/FuelTank/restock-fueltank-sphere-0625-1.mu b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/FuelTank/restock-fueltank-sphere-0625-1.mu index eabe080d..40871c70 100644 Binary files a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/FuelTank/restock-fueltank-sphere-0625-1.mu and b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/FuelTank/restock-fueltank-sphere-0625-1.mu differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/FuelTank/restock-fueltank-sphere-125-1.mu b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/FuelTank/restock-fueltank-sphere-125-1.mu index 0abb9511..45d3f9d6 100644 Binary files a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/FuelTank/restock-fueltank-sphere-125-1.mu and b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/FuelTank/restock-fueltank-sphere-125-1.mu differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/FuelTank/restock-fueltank-sphere-1875-1.mu b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/FuelTank/restock-fueltank-sphere-1875-1.mu index f2155b1f..60dc2db3 100644 Binary files a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/FuelTank/restock-fueltank-sphere-1875-1.mu and b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/FuelTank/restock-fueltank-sphere-1875-1.mu differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/FuelTank/restock-fueltank-sphere-25-1.mu b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/FuelTank/restock-fueltank-sphere-25-1.mu index 574cde76..d2c21467 100644 Binary files a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/FuelTank/restock-fueltank-sphere-25-1.mu and b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/FuelTank/restock-fueltank-sphere-25-1.mu differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/FuelTank/restock-fueltank-sphere-375-1.mu b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/FuelTank/restock-fueltank-sphere-375-1.mu index 2280ac55..ec7fa662 100644 Binary files a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/FuelTank/restock-fueltank-sphere-375-1.mu and b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/FuelTank/restock-fueltank-sphere-375-1.mu differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/0625/restock-fuel-tank-sphere-0625-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/0625/restock-fuel-tank-sphere-0625-1.cfg index a201e7f0..8a9cc4db 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/0625/restock-fuel-tank-sphere-0625-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/0625/restock-fuel-tank-sphere-0625-1.cfg @@ -10,6 +10,12 @@ PART model = ReStockPlus/Assets/FuelTank/restock-fueltank-sphere-0625-1 scale = 1.0, 1.0, 1.0 } + MODEL + { + model = ReStock/Assets/FuelTank/restock-endcap-fueltank-0625-grey + scale = 1.0, -1.0, 1.0 + position = 0.0, -0.078, 0.0 + } scale = 1 rescaleFactor = 1 // Attachment diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/125/restock-fuel-tank-sphere-125-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/125/restock-fuel-tank-sphere-125-1.cfg index 2d09e06a..813a4f77 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/125/restock-fuel-tank-sphere-125-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/125/restock-fuel-tank-sphere-125-1.cfg @@ -9,6 +9,12 @@ PART { model = ReStockPlus/Assets/FuelTank/restock-fueltank-sphere-125-1 scale = 1.0, 1.0, 1.0 + } + MODEL + { + model = ReStock/Assets/FuelTank/restock-endcap-fueltank-125-orange + scale = 1.0, -1.0, 1.0 + position = 0.0, -0.18, 0.0 } scale = 1 rescaleFactor = 1 diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/1875/restock-fuel-tank-sphere-1875-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/1875/restock-fuel-tank-sphere-1875-1.cfg index 27b4de0a..5d64dcc1 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/1875/restock-fuel-tank-sphere-1875-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/1875/restock-fuel-tank-sphere-1875-1.cfg @@ -9,6 +9,12 @@ PART { model = ReStockPlus/Assets/FuelTank/restock-fueltank-sphere-1875-1 scale = 1.0, 1.0, 1.0 + } + MODEL + { + model = ReStock/Assets/FuelTank/restock-endcap-fueltank-1875-grey + scale = 1.0, -1.0, 1.0 + position = 0.0, -0.203, 0.0 } scale = 1 rescaleFactor = 1 diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/25/restock-fuel-tank-sphere-25-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/25/restock-fuel-tank-sphere-25-1.cfg index c886f519..07dd9f9b 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/25/restock-fuel-tank-sphere-25-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/25/restock-fuel-tank-sphere-25-1.cfg @@ -9,6 +9,12 @@ PART { model = ReStockPlus/Assets/FuelTank/restock-fueltank-sphere-25-1 scale = 1.0, 1.0, 1.0 + } + MODEL + { + model = ReStock/Assets/FuelTank/restock-endcap-fueltank-25-orange + scale = 1.0, -1.0, 1.0 + position = 0.0, -0.3799, 0.0 } scale = 1 rescaleFactor = 1 diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/375/restock-fuel-tank-sphere-375-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/375/restock-fuel-tank-sphere-375-1.cfg index 6a28074e..33b8ae29 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/375/restock-fuel-tank-sphere-375-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/375/restock-fuel-tank-sphere-375-1.cfg @@ -9,6 +9,12 @@ PART { model = ReStockPlus/Assets/FuelTank/restock-fueltank-sphere-375-1 scale = 1.0, 1.0, 1.0 + } + MODEL + { + model = ReStock/Assets/FuelTank/restock-endcap-fueltank-375-orange + scale = 0.98, -1.0, 0.98 + position = 0.0, -0.28, 0.0 } scale = 1 rescaleFactor = 1