diff --git a/.gitignore b/.gitignore index a45fc5ca..d023a5dd 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ Distribution/Restock/GameData/ReStock/Spaces/**/*.png Distribution/Restock/GameData/ReStock/Props/**/*.png Distribution/RestockPlus/GameData/ReStockPlus/Props/**/*.png Distribution/RestockPlus/GameData/ReStockPlus/Spaces/**/*.png +Distribution/Restock/GameData/ReStock/RestockPatchDisabler.cfg diff --git a/Distribution/Restock/.mod_data.yml b/Distribution/Restock/.mod_data.yml index 7ce601ae..efdc7807 100644 --- a/Distribution/Restock/.mod_data.yml +++ b/Distribution/Restock/.mod_data.yml @@ -13,7 +13,7 @@ package: - RestockRigidLegs dependencies: # Configure dependencies ModuleManager: - version: 4.1.4 + version: 4.2.1 location: s3 deploy: SpaceDock: diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-125-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-125-1.dds index 962863e3..cba07615 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-125-1.dds and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-125-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-25-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-25-1.dds index 2569c484..75371e75 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-25-1.dds and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-25-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-25-3.mu b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-25-3.mu new file mode 100644 index 00000000..70f1b47c Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-25-3.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-inline-mk2-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-inline-mk2-1.mu index b6ede8a6..23aadbd0 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-inline-mk2-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-inline-mk2-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-2.mu b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-2.mu index e94e26fe..2ad02a22 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-2.mu and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-2.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-125-additional-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-125-additional-1-n.dds index 9c5b7bcc..82034689 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-125-additional-1-n.dds and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-125-additional-1-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-125-revised-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-125-revised-1-n.dds index 54d57cc3..297f6791 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-125-revised-1-n.dds and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-125-revised-1-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-reliant-2.mu b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-reliant-2.mu new file mode 100644 index 00000000..2264eeb5 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-reliant-2.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-shroud-125-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-shroud-125-1-n.dds index b6219754..30719279 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-shroud-125-1-n.dds and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-shroud-125-1-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-swivel-2.mu b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-swivel-2.mu new file mode 100644 index 00000000..58cd7a45 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-swivel-2.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-docking.cfg b/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-docking.cfg index a8ec5cda..3f105571 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-docking.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-docking.cfg @@ -121,7 +121,7 @@ !MODEL {} MODEL { - model = ReStock/Assets/Coupling/restock-docking-25-2 + model = ReStock/Assets/Coupling/restock-docking-25-3 } MODEL { @@ -131,7 +131,40 @@ rotation = 180, 0, 0 } %rescaleFactor = 1 - + !MODULE[ModulePartVariants] {} + MODULE + { + name = ModulePartVariants + baseVariant = Gray with Stripes + useMultipleDragCubes = false + VARIANT + { + name = Gray with Stripes + displayName = #autoLOC_8320084 + themeName = Gray + primaryColor = #999999 + themeName = Gray with Stripes + secondaryColor = #b08b39 + GAMEOBJECTS + { + Docking25Base = true + Docking25Grey = false + } + } + VARIANT + { + name = Gray + displayName = #autoLOC_8007101 + themeName = Gray + primaryColor = #999999 + secondaryColor = #999999 + GAMEOBJECTS + { + Docking25Base = false + Docking25Grey = true + } + } + } } // Clamp-O-Tron Shielded Docking Port 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 ca6fb89e..77542b70 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 @@ -3,8 +3,8 @@ // - LV-N "Nerv" Atomic Rocket Motor (nuclearEngine) // - S3 KS-25 "Vector" Liquid Fuel Engine (SSME) // - LV-909 "Terrier" Liquid Fuel Engine (liquidEngine3_v2) -// - LV-T30 "Reliant" Liquid Fuel Engine (liquidEngine) -// - LV-T45 "Swivel" Liquid Fuel Engine (liquidEngine2) +// - 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 // - T-1 Toroidal "Aerospike" Liquid Fuel Engine (toroidalAerospike) - FX only @@ -904,14 +904,14 @@ } // LV-T30 "Reliant" Liquid Fuel Engine -@PART[liquidEngine]:HAS[~RestockIgnore[*]]:FOR[000_ReStock] +@PART[liquidEngine_v2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock] { @author = Porkjet and Chris Adderley (Nertea) !mesh = DELETE !MODEL {} MODEL { - model = ReStock/Assets/Engine/restock-engine-reliant-1 + model = ReStock/Assets/Engine/restock-engine-reliant-2 } %rescaleFactor = 1 @scale = 1 @@ -1021,16 +1021,17 @@ } } @bulkheadProfiles = srf, size1 - %node_attach = 0.0, 0.90182625, 0.0, 0.0, 1.0, 0.0, 1 - @node_stack_top = 0.0, 0.90182625, 0.0, 0.0, 1.0, 0.0 - @node_stack_bottom = 0.0, -0.90925375, 0.0, 0.0, -1.0, 0.0 + + %node_attach = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 1 + + !MODULE[ModulePartVariants] {} MODULE { name = ModulePartVariants - baseVariant = Size1 + baseVariant = TrussMount VARIANT { - name = Size1 + name = TrussMount displayName = #LOC_Restock_variant-engine_size1_white primaryColor = #999999 secondaryColor = #ffffff @@ -1051,7 +1052,7 @@ } VARIANT { - name = Boattail + name = Shroud displayName = #LOC_Restock_variant-engine_boattail_white primaryColor = #ffffff secondaryColor = #ffffff @@ -1072,7 +1073,7 @@ } VARIANT { - name = Compact + name = Bare displayName = #LOC_Restock_variant-engine_compact_white primaryColor = #666666 secondaryColor = #ffffff @@ -1155,6 +1156,10 @@ } } } + @MODULE[ModuleSurfaceFX] + { + @thrustProviderModuleIndex= 0 + } @MODULE[ModuleEngines] { @name = ModuleEnginesFX @@ -1245,20 +1250,18 @@ } // LV-T45 "Swivel" Liquid Fuel Engine -@PART[liquidEngine2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock] +@PART[liquidEngine2_v2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock] { @author = Porkjet and Chris Adderley (Nertea) !mesh = DELETE !MODEL {} MODEL { - model = ReStock/Assets/Engine/restock-engine-swivel-1 + model = ReStock/Assets/Engine/restock-engine-swivel-2 } @bulkheadProfiles = srf, size1 rescaleFactor = 1.0 - @node_stack_top = 0.0, 9.0182625, 0.0, 0.0, 1.0, 0.0 - @node_stack_bottom = 0.0, -7.179225, 0.0, 0.0, -1.0, 0.0 - %node_attach = 0.0, 9.0182625, 0.0, 0.0, 1.0, 0.0, 1 + %node_attach = 0.0, 0, 0.0, 0.0, 1.0, 0.0, 1 @attachRules = 1,1,1,0,0 !DRAG_CUBE {} DRAG_CUBE @@ -1275,6 +1278,8 @@ !sound_rocket_hard = DELETE !sound_vent_soft = DELETE !sound_explosion_low = DELETE + + !MODULE[ModulePartVariants] {} EFFECTS { engage @@ -1351,18 +1356,23 @@ } } } + @MODULE[ModuleSurfaceFX] + { + @thrustProviderModuleIndex= 0 + } @MODULE[ModuleEngines] { @name = ModuleEnginesFX %runningEffectName = fx-swivel-running } + MODULE { name = ModulePartVariants - baseVariant = Size1 + baseVariant = TrussMount VARIANT { - name = Size1 + name = TrussMount displayName = #LOC_Restock_variant-engine_size1_white primaryColor = #999999 secondaryColor = #ffffff @@ -1389,7 +1399,7 @@ } VARIANT { - name = Boattail + name = Shroud displayName = #LOC_Restock_variant-engine_boattail_white primaryColor = #ffffff secondaryColor = #ffffff @@ -1416,7 +1426,7 @@ } VARIANT { - name = Compact + name = Bare displayName = #LOC_Restock_variant-engine_compact_white primaryColor = #666666 secondaryColor = #ffffff @@ -1534,6 +1544,7 @@ gimbalResponseSpeed = 8 useGimbalResponseSpeed = true } + !MODULE[FXModuleLookAtConstraint] {} MODULE { name = FXModuleLookAtConstraint diff --git a/Distribution/Restock/GameData/ReStock/PatchesLegacy/Engines/restock-engines-liquid-125.cfg b/Distribution/Restock/GameData/ReStock/PatchesLegacy/Engines/restock-engines-liquid-125.cfg new file mode 100644 index 00000000..2b9fb3d1 --- /dev/null +++ b/Distribution/Restock/GameData/ReStock/PatchesLegacy/Engines/restock-engines-liquid-125.cfg @@ -0,0 +1,759 @@ +// Patches applying art changes to old versions of 1.25m engines +// Contents: +// - LV-T30 "Reliant" Liquid Fuel Engine (liquidEngine) +// - LV-T45 "Swivel" Liquid Fuel Engine (liquidEngine2) + +// LV-T30 "Reliant" Liquid Fuel Engine +@PART[liquidEngine]:HAS[~RestockIgnore[*]]:FOR[000_ReStock] +{ + @author = Porkjet and Chris Adderley (Nertea) + !mesh = DELETE + !MODEL {} + MODEL + { + model = ReStock/Assets/Engine/restock-engine-reliant-1 + } + %rescaleFactor = 1 + @scale = 1 + @attachRules = 1,1,1,0,0 + !DRAG_CUBE {} + DRAG_CUBE + { + cube = 0, 1.323,0.7658,0.6937, 1.323,0.7658,0.6937, 1.2,0.71,1.99, 1.2,0.60,1.863, 1.342,0.7654,0.7222, 1.342,0.7655,0.7222, -4.768E-07,0.04716,-1.442E-05, 1.25,1.959,1.25 + cube = 1, 1.626,0.7348,0.9771, 1.626,0.7485,0.7117, 1.199,0.9966,0.321, 1.199,0.4031,1.449, 1.682,0.7548,0.7173, 1.682,0.7527,0.7117, 0.0001327,0.07738,-1.454E-05, 1.24,1.899,1.24 + cube = 2, 1.344,0.7648,0.6937, 1.344,0.7649,0.7165, 1.2,0.41,1.999, 1.2,0.40,1.914, 1.342,0.7641,0.7222, 1.342,0.7642,0.7222, -0.0001337,0.04716,-0.001876, 1.25,1.959,1.25 + } + !fx_exhaustFlame_blue = DELETE + !fx_exhaustLight_blue = DELETE + !fx_smokeTrail_light = DELETE + !fx_exhaustSparks_flameout = DELETE + !sound_vent_medium = DELETE + !sound_rocket_hard = DELETE + !sound_vent_soft = DELETE + !sound_explosion_low = DELETE + !EFFECTS {} + EFFECTS + { + engage + { + AUDIO + { + channel = Ship + clip = sound_vent_medium + volume = 1.0 + pitch = 2.0 + loop = false + } + } + flameout + { + AUDIO + { + channel = Ship + clip = sound_explosion_low + volume = 1.0 + pitch = 2.0 + loop = false + } + } + fx-reliant-running + { + AUDIO + { + channel = Ship + clip = sound_rocket_hard + volume = 0.0 0.0 + volume = 0.01 0.4 + volume = 1.0 1.0 + pitch = 0.0 0.2 + pitch = 0.01 0.6 + pitch = 1.0 1.8 + loop = true + } + MODEL_MULTI_PARTICLE + { + name = turbo + modelName = ReStock/FX/restock-fx-reliant-turbo-1 + transformName = fxTransformTurbo + 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 + } + MODEL_MULTI_PARTICLE + { + name = core + modelName = ReStock/FX/restock-fx-reliant-core-1 + transformName = fxTransformCore + 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 + } + MODEL_MULTI_PARTICLE + { + name = plume + modelName = ReStock/FX/restock-fx-reliant-plume-1 + transformName = fxTransformPlume + 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 + } + PREFAB_PARTICLE + { + prefabName = fx_smokeTrail_light + transformName = smokePoint + emission = 0.0 0.0 + emission = 0.05 0.0 + emission = 0.075 0.25 + emission = 1.0 1.25 + speed = 0.0 0.25 + speed = 1.0 1.0 + localOffset = 0, 0, 0 + } + } + } + @bulkheadProfiles = srf, size1 + %node_attach = 0.0, 0.90182625, 0.0, 0.0, 1.0, 0.0, 1 + @node_stack_top = 0.0, 0.90182625, 0.0, 0.0, 1.0, 0.0 + @node_stack_bottom = 0.0, -0.90925375, 0.0, 0.0, -1.0, 0.0 + MODULE + { + name = ModulePartVariants + baseVariant = Size1 + VARIANT + { + name = Size1 + displayName = #LOC_Restock_variant-engine_size1_white + primaryColor = #999999 + secondaryColor = #ffffff + GAMEOBJECTS + { + LV_T30_Basic = true + LV_T30_Compact = false + 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 + { + name = Boattail + displayName = #LOC_Restock_variant-engine_boattail_white + primaryColor = #ffffff + secondaryColor = #ffffff + GAMEOBJECTS + { + LV_T30_Basic = false + LV_T30_Compact = false + 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 + { + name = Compact + displayName = #LOC_Restock_variant-engine_compact_white + primaryColor = #666666 + secondaryColor = #ffffff + GAMEOBJECTS + { + LV_T30_Basic = false + LV_T30_Compact = true + 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 + } + } + VARIANT + { + name = Size1_Alternate + displayName = #LOC_Restock_variant-engine_size1_grey-orange + primaryColor = #999999 + secondaryColor = #f69449 + GAMEOBJECTS + { + 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 = Boattail_Alternate + displayName = #LOC_Restock_variant-engine_boattail_grey-orange + primaryColor = #666666 + secondaryColor = #666666 + GAMEOBJECTS + { + LV_T30_Basic = false + LV_T30_Compact = false + LV_T30_Boattail = true + fairing = false + ShroudT30_Compact = false + fairingWhite = false + 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_grey-orange + primaryColor = #666666 + secondaryColor = #f69449 + 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 + %runningEffectName = fx-reliant-running + } + @MODULE[ModuleJettison] + { + @jettisonName = fairing,ShroudT30_Compact + useMultipleDragCubes = false + } + !MODULE[FXModuleAnimateThrottle] {} + MODULE + { + name = FXModuleThrottleEffects + fxModuleNames = heatColor + responseSpeed = 1.0 + dependOnEngineState = True + dependOnThrottle = True + } + MODULE + { + name = FXModuleThrottleEffects + fxModuleNames = throttleColor + responseSpeed = 1.0 + dependOnEngineState = True + dependOnThrottle = True + } + MODULE + { + name = ModuleColorChanger + moduleID = heatColor + animRate = 0.025 + shaderProperty = _EmissiveColor + excludedRenderer = EngineCoreT30Glow + 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 = ModuleColorChanger + moduleID = throttleColor + animRate = 1 + shaderProperty = _TintColor + includedRenderer = EngineCoreT30Glow + 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 + } + } +} + +// LV-T45 "Swivel" Liquid Fuel Engine +@PART[liquidEngine2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock] +{ + @author = Porkjet and Chris Adderley (Nertea) + !mesh = DELETE + !MODEL {} + MODEL + { + model = ReStock/Assets/Engine/restock-engine-swivel-1 + } + @bulkheadProfiles = srf, size1 + rescaleFactor = 1.0 + @node_stack_top = 0.0, 9.0182625, 0.0, 0.0, 1.0, 0.0 + @node_stack_bottom = 0.0, -7.179225, 0.0, 0.0, -1.0, 0.0 + %node_attach = 0.0, 9.0182625, 0.0, 0.0, 1.0, 0.0, 1 + @attachRules = 1,1,1,0,0 + !DRAG_CUBE {} + DRAG_CUBE + { + cube = 0, 1.068,0.7677,0.8473, 1.068,0.7677,0.6994, 1.2,0.71,1.582, 1.2,0.63,1.716, 1.061,0.7673,0.6994, 1.061,0.7674,0.6994, 0,0.1126,0, 1.25,1.703,1.25 + cube = 1, 1.498,0.7444,0.8578, 1.498,0.721,0.9836, 1.234,0.9966,0.2519, 1.234,0.4147,1.423, 1.535,0.7475,0.7262, 1.535,0.7471,0.7205, 0,0.1194,1.788E-07, 1.258,1.689,1.258 + cube = 2, 1.075,0.768,0.7165, 1.075,0.7679,0.6994, 1.2,0.42,1.582, 1.2,0.40,1.657, 1.069,0.7671,0.6994, 1.069,0.7672,0.6994, 0,0.1126,0, 1.25,1.703,1.25 + } + !fx_exhaustFlame_blue = DELETE + !fx_exhaustLight_blue = DELETE + !fx_smokeTrail_light = DELETE + !fx_exhaustSparks_flameout = DELETE + !sound_vent_medium = DELETE + !sound_rocket_hard = DELETE + !sound_vent_soft = DELETE + !sound_explosion_low = DELETE + EFFECTS + { + engage + { + AUDIO + { + channel = Ship + clip = sound_vent_medium + volume = 1.0 + pitch = 2.0 + loop = false + } + } + flameout + { + AUDIO + { + channel = Ship + clip = sound_explosion_low + volume = 1.0 + pitch = 2.0 + loop = false + } + } + fx-swivel-running + { + AUDIO + { + channel = Ship + clip = sound_rocket_hard + volume = 0.0 0.0 + volume = 0.01 0.4 + volume = 1.0 1.0 + pitch = 0.0 0.2 + pitch = 0.01 0.6 + pitch = 1.0 1.8 + loop = true + } + MODEL_MULTI_PARTICLE + { + name = core + modelName = ReStock/FX/restock-fx-swivel-core-1 + transformName = fxTransformCore + 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 + } + MODEL_MULTI_PARTICLE + { + name = plume + modelName = ReStock/FX/restock-fx-swivel-plume-1 + transformName = fxTransformPlume + 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 + } + PREFAB_PARTICLE + { + prefabName = fx_smokeTrail_light + transformName = smokePoint + emission = 0.0 0.0 + emission = 0.05 0.0 + emission = 0.075 0.25 + emission = 1.0 1.25 + speed = 0.0 0.25 + speed = 1.0 1.0 + localOffset = 0, 0, 0 + } + } + } + @MODULE[ModuleEngines] + { + @name = ModuleEnginesFX + %runningEffectName = fx-swivel-running + } + MODULE + { + name = ModulePartVariants + baseVariant = Size1 + VARIANT + { + name = Size1 + displayName = #LOC_Restock_variant-engine_size1_white + primaryColor = #999999 + secondaryColor = #ffffff + GAMEOBJECTS + { + 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 = true + ShroudT45_CompactWhite = true + Frame_Boat = true + fairingOrange = false + ShroudT45_CompactOrange = false + Frame_BoatOrange = false + } + } + VARIANT + { + name = Boattail + displayName = #LOC_Restock_variant-engine_boattail_white + primaryColor = #ffffff + secondaryColor = #ffffff + 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 = true + ShroudT45_CompactWhite = true + Frame_Boat = true + fairingOrange = false + ShroudT45_CompactOrange = false + Frame_BoatOrange = false + } + } + VARIANT + { + name = Compact + displayName = #LOC_Restock_variant-engine_compact_white + primaryColor = #666666 + secondaryColor = #ffffff + 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 = true + ShroudT45_CompactWhite = true + Frame_Boat = true + fairingOrange = false + ShroudT45_CompactOrange = false + Frame_BoatOrange = false + } + } + VARIANT + { + name = Size1_Alternate + displayName = #LOC_Restock_variant-engine_size1_grey-orange + primaryColor = #999999 + secondaryColor = #f69449 + GAMEOBJECTS + { + 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 = Boattail_Alternate + displayName = #LOC_Restock_variant-engine_boattail_grey-orange + primaryColor = #666666 + secondaryColor = #666666 + 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 + ShroudT45_CompactWhite = false + Frame_Boat = false + fairingOrange = true + ShroudT45_CompactOrange = true + Frame_BoatOrange = true + } + } + VARIANT + { + name = Compact_Alternate + displayName = #LOC_Restock_variant-engine_compact_grey-orange + primaryColor = #666666 + secondaryColor = #f69449 + 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 + useMultipleDragCubes = false + } + @MODULE[ModuleGimbal] + { + @gimbalTransformName = Gimbal + gimbalResponseSpeed = 8 + useGimbalResponseSpeed = true + } + MODULE + { + name = FXModuleLookAtConstraint + // Basic + CONSTRAINLOOKFX + { + targetName = T45_PistonTop001 + rotatorsName = T45_Piston001 + } + CONSTRAINLOOKFX + { + targetName = T45_PistonTop002 + rotatorsName = T45_Piston002 + } + CONSTRAINLOOKFX + { + targetName = T45_Piston001 + rotatorsName = T45_PistonTop001 + } + CONSTRAINLOOKFX + { + targetName = T45_Piston002 + rotatorsName = T45_PistonTop002 + } + CONSTRAINLOOKFX + { + targetName = T45_PistonTop004 + rotatorsName = T45_Piston003 + } + CONSTRAINLOOKFX + { + targetName = T45_PistonTop003 + rotatorsName = T45_Piston004 + } + CONSTRAINLOOKFX + { + targetName = T45_Piston001 + rotatorsName = T45_PistonTop004 + } + CONSTRAINLOOKFX + { + targetName = T45_Piston002 + rotatorsName = T45_PistonTop003 + } + } + !MODULE[FXModuleAnimateThrottle] {} + MODULE + { + name = FXModuleThrottleEffects + fxModuleNames = heatColor + responseSpeed = 1.0 + dependOnEngineState = True + dependOnThrottle = True + } + MODULE + { + name = FXModuleThrottleEffects + fxModuleNames = throttleColor + responseSpeed = 1.0 + dependOnEngineState = True + dependOnThrottle = True + } + MODULE + { + name = ModuleColorChanger + moduleID = heatColor + animRate = 0.025 + shaderProperty = _EmissiveColor + excludedRenderer = EngineCoreT45Glow + 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 = ModuleColorChanger + moduleID = throttleColor + animRate = 1 + shaderProperty = _TintColor + includedRenderer = EngineCoreT45Glow + toggleInEditor = false + toggleInFlight = false + redCurve + { + key = 0 1 + key = 1 1 + } + greenCurve + { + key = 0 1 + key = 1 1 + } + blueCurve + { + key = 0 1 + key = 1 1 + } + alphaCurve + { + key = 0 0 + key = 1 1 + } + } +} diff --git a/Distribution/Restock/GameData/ReStock/Restock.restockblacklist b/Distribution/Restock/GameData/ReStock/Restock.restockblacklist index 199d83b4..8a32cce5 100644 --- a/Distribution/Restock/GameData/ReStock/Restock.restockblacklist +++ b/Distribution/Restock/GameData/ReStock/Restock.restockblacklist @@ -55,6 +55,8 @@ Squad/Parts/Engine/liquidEngineLV-909_v2/ Squad/Parts/Engine/liquidEngineLV-N/ Squad/Parts/Engine/liquidEngineLV-T30/ Squad/Parts/Engine/liquidEngineLV-T45/ +Squad/Parts/Engine/liquidEngineLV-T30_v2/ +Squad/Parts/Engine/liquidEngineLV-T45_v2/ Squad/Parts/Engine/liquidEngineMainsail_v2/ Squad/Parts/Engine/liquidEnginePoodle_v2/ Squad/Parts/Engine/liquidEngineSkipper_v2/ diff --git a/Distribution/Restock/GameData/ReStock/Versioning/ReStock.version b/Distribution/Restock/GameData/ReStock/Versioning/ReStock.version index 980a8ff7..6849245b 100644 --- a/Distribution/Restock/GameData/ReStock/Versioning/ReStock.version +++ b/Distribution/Restock/GameData/ReStock/Versioning/ReStock.version @@ -6,19 +6,19 @@ { "MAJOR":1, "MINOR":4, - "PATCH":1, + "PATCH":2, "BUILD":0 }, "KSP_VERSION": { "MAJOR":1, "MINOR":12, - "PATCH":1 + "PATCH":2 }, "KSP_VERSION_MIN":{ "MAJOR":1, "MINOR":12, - "PATCH":1 + "PATCH":2 }, "KSP_VERSION_MAX":{ "MAJOR":1, diff --git a/Distribution/Restock/changelog.txt b/Distribution/Restock/changelog.txt index 7a47fdd5..3522c459 100644 --- a/Distribution/Restock/changelog.txt +++ b/Distribution/Restock/changelog.txt @@ -1,3 +1,12 @@ +v1.4.2 +------ +- KSP 1.12.2 +- Updated ModuleManager to 4.2.1 +- Fixed Gigantor panel extension +- Adjusted and applied Restock Swivel and Reliant models to fit new Squad revamps (adjusted dimensions, colliders) +- Fixed Mk2 docking port not docking +- Added new Senior docking port grey variant + v1.4.1 ------ - Numerous fixes to circular solar panel model (shrouded and not) diff --git a/Distribution/Restock/readme.txt b/Distribution/Restock/readme.txt index c86ab944..be5ac175 100644 --- a/Distribution/Restock/readme.txt +++ b/Distribution/Restock/readme.txt @@ -1,5 +1,5 @@ ============= -RESTOCK 1.4.1 +RESTOCK 1.4.2 ============= Restock is a project to improve the art of the Kerbal Space Program part set. Some of the revisions are based on the canceled Part Overhaul project by Porkjet. @@ -13,7 +13,7 @@ DEPENDENCIES ============ Required: -- ModuleManager (4.1.4) +- ModuleManager (4.2.1) ======= CREDITS @@ -50,7 +50,7 @@ To install, drag the ReStock folder and ModuleManager DLL from the GameData fold - Assets - Patches - etc. - - ModuleManager.4.1.4.dll + - ModuleManager.4.2.1.dll =============== ASSET BLACKLIST diff --git a/Distribution/RestockPlus/.mod_data.yml b/Distribution/RestockPlus/.mod_data.yml index fdce0645..196cf799 100644 --- a/Distribution/RestockPlus/.mod_data.yml +++ b/Distribution/RestockPlus/.mod_data.yml @@ -10,7 +10,7 @@ package: - license.txt dependencies: # Configure dependencies ModuleManager: - version: 4.1.4 + version: 4.2.1 location: s3 deploy: SpaceDock: diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Versioning/ReStockPlus.version b/Distribution/RestockPlus/GameData/ReStockPlus/Versioning/ReStockPlus.version index b1c4dfe6..6e51c017 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Versioning/ReStockPlus.version +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Versioning/ReStockPlus.version @@ -6,19 +6,19 @@ { "MAJOR":1, "MINOR":4, - "PATCH":1, + "PATCH":2, "BUILD":0 }, "KSP_VERSION": { "MAJOR":1, "MINOR":12, - "PATCH":1 + "PATCH":2 }, "KSP_VERSION_MIN":{ "MAJOR":1, "MINOR":12, - "PATCH":1 + "PATCH":2 }, "KSP_VERSION_MAX":{ "MAJOR":1, diff --git a/Distribution/RestockPlus/changelog.txt b/Distribution/RestockPlus/changelog.txt index 33d53687..c1991119 100644 --- a/Distribution/RestockPlus/changelog.txt +++ b/Distribution/RestockPlus/changelog.txt @@ -1,3 +1,8 @@ +v1.4.2 +------ +- KSP 1.12.2 +- Updated ModuleManager to 4.2.1 + v1.4.1 ------ - Fixed Boar additional extraneous boattail mesh diff --git a/Distribution/RestockPlus/readme.txt b/Distribution/RestockPlus/readme.txt index 8a83ca26..767de4b8 100644 --- a/Distribution/RestockPlus/readme.txt +++ b/Distribution/RestockPlus/readme.txt @@ -1,5 +1,5 @@ ============== -RESTOCK+ 1.4.1 +RESTOCK+ 1.4.2 ============== Restock+ is a complement to Restock which adds useful parts that we feel are missing from the base game. Functionally, these parts additions allow better flexibility in craft construction and not add new gameplay systems or form factors. Some examples might include: @@ -21,8 +21,8 @@ DEPENDENCIES ============ Required: -- Restock (1.3.3) -- ModuleManager (4.1.4) +- Restock (1.4.2) +- ModuleManager (4.2.1) ============= CREDITS