diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-external-command-seat-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-external-command-seat-1-n.dds new file mode 100644 index 00000000..15190c21 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-external-command-seat-1-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-external-command-seat-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-external-command-seat-1.dds new file mode 100644 index 00000000..94f1e3f8 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-external-command-seat-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-external-command-seat-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-external-command-seat-1.mu new file mode 100644 index 00000000..b3ad3088 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-external-command-seat-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-thud-1-e.dds b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-thud-1-e.dds new file mode 100644 index 00000000..31e4ebdf Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-thud-1-e.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-thud-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-thud-1-n.dds new file mode 100644 index 00000000..584e881c Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-thud-1-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-thud-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-thud-1.dds new file mode 100644 index 00000000..ccf0232d Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-thud-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-thud-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-thud-1.mu new file mode 100644 index 00000000..5551a1c1 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-thud-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-cargo-inventory-12-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-cargo-inventory-12-1-n.dds new file mode 100644 index 00000000..fec93422 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-cargo-inventory-12-1-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-cargo-inventory-125-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-cargo-inventory-125-1-n.dds new file mode 100644 index 00000000..fec93422 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-cargo-inventory-125-1-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-cargo-inventory-125-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-cargo-inventory-125-1.dds new file mode 100644 index 00000000..2c8ed132 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-cargo-inventory-125-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-cargo-inventory-125-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-cargo-inventory-125-1.mu new file mode 100644 index 00000000..50094e16 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-cargo-inventory-125-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-cargo-inventory-25-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-cargo-inventory-25-1-n.dds new file mode 100644 index 00000000..b0c03984 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-cargo-inventory-25-1-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-cargo-inventory-25-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-cargo-inventory-25-1.dds new file mode 100644 index 00000000..d04d40e0 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-cargo-inventory-25-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-cargo-inventory-25-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-cargo-inventory-25-1.mu new file mode 100644 index 00000000..50eb1f05 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-cargo-inventory-25-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-cargo-inventory-box-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-cargo-inventory-box-1-n.dds new file mode 100644 index 00000000..32a299ed Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-cargo-inventory-box-1-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-cargo-inventory-box-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-cargo-inventory-box-1.dds new file mode 100644 index 00000000..7f5f88a4 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-cargo-inventory-box-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-cargo-inventory-box-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-cargo-inventory-box-1.mu new file mode 100644 index 00000000..2752e190 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-cargo-inventory-box-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-cargo-inventory-conformal-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-cargo-inventory-conformal-1-n.dds new file mode 100644 index 00000000..353316ed Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-cargo-inventory-conformal-1-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-cargo-inventory-conformal-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-cargo-inventory-conformal-1.dds new file mode 100644 index 00000000..27ea4a0d Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-cargo-inventory-conformal-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-cargo-inventory-conformal-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-cargo-inventory-conformal-1.mu new file mode 100644 index 00000000..6a5f1b2e Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-cargo-inventory-conformal-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg b/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg index b98f5715..34bcac99 100644 --- a/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg +++ b/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg @@ -66,6 +66,7 @@ Localization #LOC_Restock_variant-engine_shroud_white = White Shroud #LOC_Restock_variant-engine_shroud_grey-orange = Metallic Shroud + #LOC_Restock_variant-engine_shroud_grey-orange-alt = Orange/Grey Shroud #LOC_Restock_variant-engine_shroud = Shrouded #LOC_Restock_variant-engine_shroud_wide = Wide Shrouded diff --git a/Distribution/Restock/GameData/ReStock/Patches/Command/restock-external-command-seat.cfg b/Distribution/Restock/GameData/ReStock/Patches/Command/restock-external-command-seat.cfg new file mode 100644 index 00000000..35e73e20 --- /dev/null +++ b/Distribution/Restock/GameData/ReStock/Patches/Command/restock-external-command-seat.cfg @@ -0,0 +1,15 @@ +// Patches applying art changes to external command seat +// Contents: +// - EAS-1 External Command Seat (seatExternalCmd) + +// EAS-1 External Command Seat +@PART[seatExternalCmd]:HAS[~RestockIgnore[*]]:FOR[000_ReStock] +{ + @author = Kavaeric + !mesh = DELETE + !MODEL,* {} + MODEL + { + model = ReStock/Assets/Command/restock-external-command-seat-1 + } +} 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 f32242b4..8098a302 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 @@ -5,7 +5,7 @@ // - LV-909 "Terrier" Liquid Fuel Engine (liquidEngine3_v2) // - LV-T30 "Reliant" Liquid Fuel Engine (liquidEngine_v2) // - LV-T45 "Swivel" Liquid Fuel Engine (liquidEngine2_v2) -// - Mk-55 "Thud" Liquid Fuel Engine (radialLiquidEngine1-2) - FX only +// - Mk-55 "Thud" Liquid Fuel Engine (radialLiquidEngine1-2) // - T-1 Toroidal "Aerospike" Liquid Fuel Engine (toroidalAerospike) // LV-N "Nerv" Atomic Rocket Motor @@ -1669,9 +1669,16 @@ } } -// Mk-55 "Thud" Liquid Fuel Engine (FX only) +// Mk-55 "Thud" Liquid Fuel Engine @PART[radialLiquidEngine1-2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock] { + @author = Kavaeric + !mesh = DELETE + !MODEL {} + MODEL + { + model = ReStock/Assets/Engine/restock-engine-thud-1 + } !fx_exhaustFlame_blue_small = DELETE !fx_exhaustLight_blue = DELETE !sound_vent_medium = DELETE @@ -1739,6 +1746,32 @@ speed = 0.0 0.35 speed = 1.0 1.0 localRotation = -90, 0, 0 + } + MODEL_MULTI_PARTICLE + { + name = turbo + modelName = ReStock/FX/restock-fx-spark-turbo-1 + transformName = exhaust_fxTransform + emission = 0.0 0.0 + emission = 0.01 0.1 + emission = 0.075 0.25 + emission = 1.0 1.0 + speed = 0.0 0.35 + speed = 1.0 1.0 + localRotation = -90, 0, 0 + } + MODEL_MULTI_PARTICLE + { + name = turboglow + modelName = ReStock/FX/restock-fx-spark-turbo-glow-1 + transformName = exhaust_fxTransform + emission = 0.0 0.0 + emission = 0.01 0.1 + emission = 0.075 0.25 + emission = 1.0 1.0 + speed = 0.0 0.35 + speed = 1.0 1.0 + localRotation = -90, 0, 0 } } } @@ -1747,6 +1780,169 @@ @name = ModuleEnginesFX %runningEffectName = fx-thud-running } + @MODULE[ModuleGimbal] + { + @gimbalTransformName = gimbal + gimbalResponseSpeed = 30 + useGimbalResponseSpeed = true + } + !FXModuleAnimateThrottle {} + MODULE + { + name = FXModuleThrottleEffects + fxModuleNames = heatColor + responseSpeed = 1.0 + dependOnEngineState = True + dependOnThrottle = True + } + MODULE + { + name = ModuleColorChanger + moduleID = heatColor + animRate = 0.025 + shaderProperty = _EmissiveColor + excludedRenderer = EngineCore + toggleInEditor = false + toggleInFlight = false + redCurve + { + key = 0 0 1 1 + key = 1 1 1 1 + } + greenCurve + { + key = 0 0 1 1 + key = 1 1 1 1 + } + blueCurve + { + key = 0 0 1 1 + key = 1 1 1 1 + } + alphaCurve + { + key = 0 0 1 1 + key = 1 1 1 1 + } + } + MODULE + { + name = FXModuleThrottleEffects + fxModuleNames = throttleColor + responseSpeed = 1.0 + dependOnEngineState = True + dependOnThrottle = True + } + MODULE + { + name = ModuleColorChanger + moduleID = throttleColor + animRate = 1 + shaderProperty = _TintColor + includedRenderer = EngineCore + toggleInEditor = false + toggleInFlight = false + redCurve + { + key = 0 0 + key = 1 1 + } + greenCurve + { + key = 0 0 + key = 1 1 + } + blueCurve + { + key = 0 0 + key = 1 1 + } + alphaCurve + { + key = 0 0 + key = 1 1 + } + } + MODULE + { + name = ModulePartVariants + baseVariant = Shrouded + VARIANT + { + name = Shrouded + displayName = #LOC_Restock_variant-engine_shroud_white + primaryColor = #ffffff + secondaryColor = #000000 + GAMEOBJECTS + { + LFS_Thud_Compact = false + gimbalArm_lower1 = false + gimbalArm_lower2 = false + LFS_Thud_Shroud = true + LFS_Thud_ShroudAlt = false + LFS_Thud_ShroudDeform = true + } + } + + VARIANT + { + name = ShroudedAlt + displayName = #LOC_Restock_variant-engine_shroud_grey-orange-alt + primaryColor = #999999 + secondaryColor = #f69449 + GAMEOBJECTS + { + LFS_Thud_Compact = false + gimbalArm_lower1 = false + gimbalArm_lower2 = false + LFS_Thud_Shroud = false + LFS_Thud_ShroudAlt = true + LFS_Thud_ShroudDeform = true + } + } + + VARIANT + { + name = Compact + displayName = #LOC_Restock_variant-engine_compact + primaryColor = #999999 + secondaryColor = #000000 + GAMEOBJECTS + { + LFS_Thud_Compact = true + gimbalArm_lower1 = true + gimbalArm_lower2 = true + LFS_Thud_Shroud = false + LFS_Thud_ShroudAlt = false + LFS_Thud_ShroudDeform = false + } + } + } + MODULE + { + name = FXModuleLookAtConstraint + CONSTRAINLOOKFX + { + targetName = gimbalArm_upper1 + rotatorsName = gimbalArm_lower1 + } + CONSTRAINLOOKFX + { + targetName = gimbalArm_lower1 + rotatorsName = gimbalArm_upper1 + } + + CONSTRAINLOOKFX + { + targetName = gimbalArm_upper2 + rotatorsName = gimbalArm_lower2 + } + CONSTRAINLOOKFX + { + targetName = gimbalArm_lower2 + rotatorsName = gimbalArm_upper2 + } + } } // T-1 Toroidal "Aerospike" Liquid Fuel Engine diff --git a/Distribution/Restock/GameData/ReStock/Patches/Payload/restock-cargo.cfg b/Distribution/Restock/GameData/ReStock/Patches/Payload/restock-cargo.cfg new file mode 100644 index 00000000..5d54ce48 --- /dev/null +++ b/Distribution/Restock/GameData/ReStock/Patches/Payload/restock-cargo.cfg @@ -0,0 +1,170 @@ +// Patches applying art changes to cargo parts +// Contents: +// - SEQ-3 Cargo Storage Unit (smallCargoContainer) +// - SEQ-3C Conformal Storage Unit (ConformalStorageUnit) +// - SEQ-9 Container Module (1.25m) (cargoContainer) +// - SEQ-24 Cargo Storage Unit (2.5m) (CargoStorageUnit) + +// SEQ-3 Cargo Storage Unit +@PART[smallCargoContainer]:HAS[~RestockIgnore[*]]:FOR[000_ReStock] +{ + @author = Kavaeric + !mesh = DELETE + !MODEL {} + MODEL + { + model = ReStock/Assets/Payload/restock-cargo-inventory-box-1 + } + MODULE + { + name = ModulePartVariants + baseVariant = white + VARIANT + { + name = white + displayName = #LOC_Restock_variant-surface_white + primaryColor = #ffffff + secondaryColor = #ffffff + GAMEOBJECTS + { + smallCargoContainer-white = true + smallCargoContainer-metal = false + } + } + VARIANT + { + name = metal + displayName = #LOC_Restock_variant-surface_metal + primaryColor = #6f6e6d + secondaryColor = #6f6e6d + GAMEOBJECTS + { + smallCargoContainer-white = false + smallCargoContainer-metal = true + } + } + } +} + +// SEQ-3C Conformal Storage Unit +@PART[ConformalStorageUnit]:HAS[~RestockIgnore[*]]:FOR[000_ReStock] +{ + @author = Kavaeric + !mesh = DELETE + !MODEL {} + MODEL + { + model = ReStock/Assets/Payload/restock-cargo-inventory-conformal-1 + } + MODULE + { + name = ModulePartVariants + baseVariant = white + VARIANT + { + name = white + displayName = #LOC_Restock_variant-surface_white + primaryColor = #ffffff + secondaryColor = #ffffff + GAMEOBJECTS + { + ConformalStorageUnit-white = true + ConformalStorageUnit-metal = false + } + } + VARIANT + { + name = metal + displayName = #LOC_Restock_variant-surface_metal + primaryColor = #6f6e6d + secondaryColor = #6f6e6d + GAMEOBJECTS + { + ConformalStorageUnit-white = false + ConformalStorageUnit-metal = true + } + } + } +} + +// SEQ-9 Container Module (1.25m) +@PART[cargoContainer]:HAS[~RestockIgnore[*]]:FOR[000_ReStock] +{ + @author = Kavaeric + !mesh = DELETE + !MODEL {} + MODEL + { + model = ReStock/Assets/Payload/restock-cargo-inventory-125-1 + } + MODULE + { + name = ModulePartVariants + baseVariant = white + VARIANT + { + name = white + displayName = #LOC_Restock_variant-surface_white + primaryColor = #ffffff + secondaryColor = #ffffff + GAMEOBJECTS + { + restock-cargo-inventory-12-1-white = true + restock-cargo-inventory-12-1-metal = false + } + } + VARIANT + { + name = metal + displayName = #LOC_Restock_variant-surface_metal + primaryColor = #6f6e6d + secondaryColor = #6f6e6d + GAMEOBJECTS + { + restock-cargo-inventory-12-1-white = false + restock-cargo-inventory-12-1-metal = true + } + } + } +} + +// SEQ-24 Cargo Storage Unit (2.5m) +@PART[CargoStorageUnit]:HAS[~RestockIgnore[*]]:FOR[000_ReStock] +{ + @author = Kavaeric + !mesh = DELETE + !MODEL {} + MODEL + { + model = ReStock/Assets/Payload/restock-cargo-inventory-25-1 + } + MODULE + { + name = ModulePartVariants + baseVariant = white + VARIANT + { + name = white + displayName = #LOC_Restock_variant-surface_white + primaryColor = #ffffff + secondaryColor = #ffffff + GAMEOBJECTS + { + restock-cargo-inventory-25-white = true + restock-cargo-inventory-25-metal = false + } + } + VARIANT + { + name = metal + displayName = #LOC_Restock_variant-surface_metal + primaryColor = #6f6e6d + secondaryColor = #6f6e6d + GAMEOBJECTS + { + restock-cargo-inventory-25-white = false + restock-cargo-inventory-25-metal = true + } + } + } +} \ No newline at end of file diff --git a/Distribution/Restock/GameData/ReStock/Restock.restockblacklist b/Distribution/Restock/GameData/ReStock/Restock.restockblacklist index 8a32cce5..ad1e0270 100644 --- a/Distribution/Restock/GameData/ReStock/Restock.restockblacklist +++ b/Distribution/Restock/GameData/ReStock/Restock.restockblacklist @@ -12,8 +12,11 @@ Squad/Parts/Aero/InflatableHeatShield/ Squad/Parts/Aero/wingletAV-R8/ Squad/Parts/Aero/wingletAV-T1/ Squad/Parts/Aero/wingletDeltaDeluxe/ +Squad/Parts/Cargo/CargoContainers/ +Squad/Parts/Cargo/StorageUnits/Assets/ Squad/Parts/Command/advancedSasModuleLarge/ Squad/Parts/Command/cupola/ +Squad/Parts/Command/externalCommandSeat/ Squad/Parts/Command/hitchhikerStorageContainer/ Squad/Parts/Command/inlineAdvancedStabilizer/ Squad/Parts/Command/inlineReactionWheel/