From f756f64d6804d2ce920d53581ad5a0d8d817bd8b Mon Sep 17 00:00:00 2001 From: SkyPhoenix999 Date: Sun, 11 Aug 2024 08:25:12 -0400 Subject: [PATCH] AJ10 Merge - Merged AJ10-118F and 118K - Remove old GEM-63 (repurposed GEM-60XL Part) --- .../Bluedog_DB/Delta/RO_Delta_Engines.cfg | 99 ++++++----- .../Bluedog_DB/Delta/RO_GEM.cfg | 26 ++- .../Bluedog_DB/RO_Waterfall_Delta.cfg | 162 ++++++++++-------- .../Bluedog_DB/RO_Waterfall_DeltaGEM.cfg | 10 +- 4 files changed, 166 insertions(+), 131 deletions(-) diff --git a/GameData/RealismOverhaul/RO_SuggestedMods/Bluedog_DB/Delta/RO_Delta_Engines.cfg b/GameData/RealismOverhaul/RO_SuggestedMods/Bluedog_DB/Delta/RO_Delta_Engines.cfg index d5677ee99d..1e2a1efa17 100644 --- a/GameData/RealismOverhaul/RO_SuggestedMods/Bluedog_DB/Delta/RO_Delta_Engines.cfg +++ b/GameData/RealismOverhaul/RO_SuggestedMods/Bluedog_DB/Delta/RO_Delta_Engines.cfg @@ -3,58 +3,78 @@ // ================================================================================ -// ================================================================================ -// AJ10-118 Configs -// ================================================================================ - - -// AJ10 118F +// AJ10 Advanced @PART[bluedog_AJ10_118F]:FOR[RealismOverhaul] { %RSSROConfig = True %rescaleFactor = 1.6 - %engineType = AJ10_Adv -} -@PART[bluedog_AJ10_118F]:AFTER[RealismOverhaulEngines] -{ - @MODULE[ModuleEngineConfigs] + !MODULE[ModuleB9PartSwitch]:HAS[#moduleID[engineSwitch]] {} + MODULE { - @configuration = AJ10-118F - !CONFIG[AJ10-138] {} - !CONFIG[AJ10-118K] {} - !CONFIG[AJ10-133-Hylas] {} + name = ModuleB9PartSwitch + moduleID = nozzle + SUBTYPE + { + name = 118F + transform = Bluedog_DB/Parts/Delta/DeltaK/bluedog_AJ10_118F(Clone) + MODULE + { + IDENTIFIER + { + name = ModuleDeployableEngine + } + moduleActive = false + } + } + SUBTYPE + { + name = 118K + transform = Bluedog_DB/Parts/Delta/DeltaK/bluedog_AJ10_118K(Clone) + MODULE + { + IDENTIFIER + { + name = ModuleDeployableEngine + } + moduleActive = false + } + } + } + MODULE + { + name = ModuleB9DisableTransform + transform = Bluedog_DB/Parts/Delta/DeltaK/bluedog_AJ10_118X(Clone) } - @title = AJ10-118F - @description = A further improvement on the AJ10 family, the AJ10-118F uses a larger engine bell to achieve superior performance. Used on the Delta F upper stage. -} - - -// AJ10 118K -@PART[bluedog_AJ10_118K]:FOR[RealismOverhaul] -{ - %RSSROConfig = True - %rescaleFactor = 1.6 %engineType = AJ10_Adv } -@PART[bluedog_AJ10_118K]:AFTER[RealismOverhaulEngines] +@PART[bluedog_AJ10_118F]:AFTER[RealismOverhaulEngines] { @MODULE[ModuleEngineConfigs] { - @configuration = AJ10-118K - !CONFIG[AJ10-138] {} - !CONFIG[AJ10-118F] {} - !CONFIG[AJ10-133-Hylas] {} + @CONFIG[AJ10-138] + { + %LinkB9PSModule[nozzle] { subtype = 118F } + } + @CONFIG[AJ10-118F] + { + %LinkB9PSModule[nozzle] { subtype = 118F } + } + @CONFIG[AJ10-118K] + { + %LinkB9PSModule[nozzle] { subtype = 118K } + } + @CONFIG[AJ10-133-Hylas] + { + %LinkB9PSModule[nozzle] { subtype = 118F } + } + @CONFIG[AJ10-133-LH] + { + %LinkB9PSModule[nozzle] { subtype = 118F } + } } - @title = AJ10-118K - @description = Main engine for the Delta-K upper stage. A further advancement on the AJ10 engine line. This one has a very large engine bell. } -// ================================================================================ -// TR-201 Configs -// ================================================================================ - - // TR-201 @PART[bluedog_TR_201]:FOR[RealismOverhaul] { @@ -78,11 +98,6 @@ } -// ================================================================================ -// First Stage Engine Configs -// ================================================================================ - - // RS-68 @PART[bluedog_DeltaIV_RS68]:FOR[RealismOverhaul] { diff --git a/GameData/RealismOverhaul/RO_SuggestedMods/Bluedog_DB/Delta/RO_GEM.cfg b/GameData/RealismOverhaul/RO_SuggestedMods/Bluedog_DB/Delta/RO_GEM.cfg index b07aac6c0d..5b4d3cb276 100644 --- a/GameData/RealismOverhaul/RO_SuggestedMods/Bluedog_DB/Delta/RO_GEM.cfg +++ b/GameData/RealismOverhaul/RO_SuggestedMods/Bluedog_DB/Delta/RO_GEM.cfg @@ -21,12 +21,12 @@ SUBTYPE { name = Ground - transform = GroundLit + transform = GroundLitBell } SUBTYPE { name = Air - transform = AirLit + transform = AirLitBell } } } @@ -98,12 +98,12 @@ SUBTYPE { name = Ground - transform = GroundLit + transform = GroundLitBell } SUBTYPE { name = Air - transform = AirLit + transform = AirLitBell } } %engineType = GEM-46 @@ -130,17 +130,13 @@ %RSSROConfig = True %rescaleFactor = 1.6 %engineType = GEM-60 -} - - -// GEM 63 -@PART[bluedog_Delta_GEM60XL]:FOR[RealismOverhaul] -{ - %RSSROConfig = True - %rescaleFactor = 1.7173 - @MODEL + @MODULE[ModuleB9PartSwitch]:HAS[#moduleID[engineSwitch]] + { + !SUBTYPE[GEM-60XL] {} + } + MODULE { - %scale = 1, 0.9481132, 1 + name = ModuleB9DisableTransform + transform = GEM60XL } - %engineType = GEM-63 } diff --git a/GameData/RealismOverhaul/Waterfall_Configs/Bluedog_DB/RO_Waterfall_Delta.cfg b/GameData/RealismOverhaul/Waterfall_Configs/Bluedog_DB/RO_Waterfall_Delta.cfg index 8001842122..20eeef65d1 100644 --- a/GameData/RealismOverhaul/Waterfall_Configs/Bluedog_DB/RO_Waterfall_Delta.cfg +++ b/GameData/RealismOverhaul/Waterfall_Configs/Bluedog_DB/RO_Waterfall_Delta.cfg @@ -3,78 +3,58 @@ // ================================================================================ -// AJ10F +// AJ10F @PART[bluedog_AJ10_118F]:BEFORE[ROWaterfall]:NEEDS[Waterfall] { !EFFECTS {} !MODULE[ModuleWaterfallFX]:HAS[#moduleID[AJ10118F]] {} - ROWaterfall - { - template = waterfall-hypergolic-aerozine50-upper-1 - audio = pressure-fed-1 - transform = thrustTransform - position = 0,0,0.01 - rotation = 0, 0, 0 - scale = 0.72, 0.72, 0.72 - glow = ro-hypergolic-az50 - } -} - - -// AJ10K -@PART[bluedog_AJ10_118K]:BEFORE[ROWaterfall]:NEEDS[Waterfall] -{ - !EFFECTS {} - !MODULE[ModuleWaterfallFX]:HAS[#moduleID[aj10118K]] {} - ROWaterfall - { - template = waterfall-hypergolic-aerozine50-upper-1 - audio = pressure-fed-1 - transform = thrustTransform - position = 0,0,0.46 - rotation = 0, 0, 0 - scale = 1.05, 1.05, 1 - glow = ro-hypergolic-az50 - } -} - + ROWaterfall + { + template = waterfall-hypergolic-aerozine50-upper-1 + audio = pressure-fed-1 + position = 0,0,0 + rotation = 0, 0, 0 + scale = 0.697, 0.697, 0.66 + glow = ro-hypergolic-az50 -// AJ10X -@PART[bluedog_AJ10_118X]:BEFORE[ROWaterfall]:NEEDS[Waterfall] -{ - !EFFECTS {} - !MODULE[ModuleWaterfallFX]:HAS[#moduleID[AJ10118X]] {} - ROWaterfall - { - template = waterfall-hypergolic-aerozine50-upper-1 - audio = pressure-fed-1 - transform = thrustTransform - position = 0,0,1.04 - rotation = 0, 0, 0 - scale = 1.3, 1.3, 1.3 - glow = ro-hypergolic-az50 - MainPlumeVariant:NEEDS[B9PartSwitch] - { - name = hydrolox - template = waterfall-hydrolox-upper-1 - position = 0,0,1 + MainPlumeVariant:NEEDS[B9PartSwitch] + { + name = 118K + template = waterfall-hypergolic-aerozine50-upper-1 + position = 0,0,0.46 rotation = 0, 0, 0 - scale = 1.364, 1.364, 1.364 - glowRecolor = ro-hydrolox-blue + scale = 1.05, 1.05, 1 recomputeGlowSize = true - } - } - @MODULE[ModuleEngineConfigs]:NEEDS[B9PartSwitch] - { - @CONFIG[AJ10-133-LH] - { - %rowaterfallVariant = hydrolox - } - } + } + MainPlumeVariant:NEEDS[B9PartSwitch] + { + name = hydrolox + template = waterfall-hydrolox-upper-1 + position = 0,0,0 + rotation = 0, 0, 0 + scale = 0.77, 0.77, 0.664 + glowRecolor = ro-hydrolox-blue + } + } + @MODULE[ModuleEngineConfigs]:NEEDS[B9PartSwitch] + { + @CONFIG[AJ10-118K] + { + %rowaterfallVariant = 118K + } + @CONFIG[AJ10-133-Hylas] + { + %rowaterfallVariant = hydrolox + } + @CONFIG[AJ10-133-LH] + { + %rowaterfallVariant = hydrolox + } + } } -// TR-201 +// TR-201 @PART[bluedog_TR_201]:BEFORE[ROWaterfall]:NEEDS[Waterfall] { !EFFECTS {} @@ -93,7 +73,7 @@ } -// RS-68 +// RS-68 @PART[bluedog_DeltaIV_RS68]:BEFORE[ROWaterfall]:NEEDS[Waterfall] { !EFFECTS {} @@ -127,7 +107,7 @@ } -// Delta IV Heavy Nosecone +// Delta IV Heavy Nosecone @PART[bluedog_DeltaIV_noseCone]:BEFORE[ROWaterfall]:NEEDS[Waterfall] { ROWaterfall @@ -149,7 +129,29 @@ } -// Delta IV Heavy Decoupler +// Vulcan Heavy Nosecone +@PART[bluedog_Vulcan_noseCone]:BEFORE[ROWaterfall]:NEEDS[Waterfall] +{ + ROWaterfall + { + template = rowaterfall-srm-vac-1 + audio = srm-1 + transform = thrustTransform + position = 0,0,0.0162 + rotation = -5.4, 0, 0 + scale = 0.08208, 0.08208, 0.54 + ExtraTemplate + { + template = rowaterfall-glow-srm + position = 0,0,0.0162 + rotation = -5.4, 0, 0 + scale = 0.1404, 0.1404, 0.0108 + } + } +} + + +// Delta IV Heavy Decoupler @PART[bluedog_DeltaIV_heavyDecoupler]:BEFORE[ROWaterfall]:NEEDS[Waterfall] { ROWaterfall @@ -170,7 +172,29 @@ } } -// DCSS 5m + +// Vulcan Heavy Decoupler +@PART[bluedog_Vulcan_heavyDecoupler]:BEFORE[ROWaterfall]:NEEDS[Waterfall] +{ + ROWaterfall + { + template = rowaterfall-srm-vac-1 + audio = srm-1 + transform = thrustTransform + position = 0,0,0 + rotation = 0, 0, 0 + scale = 0.056, 0.065, 0.54 + ExtraTemplate + { + template = rowaterfall-glow-srm + position = 0,0,0 + rotation = 0, 0, 0 + scale = 0.095, 0.11, 0.2 + } + } +} + +// DCSS 5m @PART[bluedog_DeltaIV_DCSS_5m]:BEFORE[ROWaterfall]:NEEDS[Waterfall] { @MODULE[ModuleWaterfallFX]:HAS[#moduleID[DCSS5]] @@ -189,7 +213,7 @@ } } -// DCSS 4m +// DCSS 4m @PART[bluedog_DCSS_Tank]:BEFORE[ROWaterfall]:NEEDS[Waterfall] { @MODULE[ModuleWaterfallFX]:HAS[#moduleID[DCSS4]] @@ -208,7 +232,7 @@ } } -// Delta P +// Delta P @PART[bluedog_DeltaP_Stage]:BEFORE[ROWaterfall]:NEEDS[Waterfall] { @MODULE[ModuleWaterfallFX]:HAS[#moduleID[deltaP]] @@ -227,7 +251,7 @@ } } -// Delta K +// Delta K @PART[bluedog_DeltaK_Stage]:BEFORE[ROWaterfall]:NEEDS[Waterfall] { @MODULE[ModuleWaterfallFX]:HAS[#moduleID[DeltaK]] diff --git a/GameData/RealismOverhaul/Waterfall_Configs/Bluedog_DB/RO_Waterfall_DeltaGEM.cfg b/GameData/RealismOverhaul/Waterfall_Configs/Bluedog_DB/RO_Waterfall_DeltaGEM.cfg index a4bdcbde75..73b84b7fd3 100644 --- a/GameData/RealismOverhaul/Waterfall_Configs/Bluedog_DB/RO_Waterfall_DeltaGEM.cfg +++ b/GameData/RealismOverhaul/Waterfall_Configs/Bluedog_DB/RO_Waterfall_DeltaGEM.cfg @@ -3,7 +3,7 @@ // ================================================================================ -// GEM-40 Radial +// GEM-40 Radial @PART[bluedog_Delta_GEM40]:BEFORE[ROWaterfall]:NEEDS[Waterfall] { !MODULE[ModuleWaterfallFX] {} @@ -38,7 +38,7 @@ } -// GEM-40 Inline +// GEM-40 Inline @PART[bluedog_Delta_GEM40_Inline]:BEFORE[ROWaterfall]:NEEDS[Waterfall] { !MODULE[ModuleWaterfallFX] {} @@ -56,7 +56,7 @@ } -// GEM-46 +// GEM-46 @PART[bluedog_Delta_GEM46]:BEFORE[ROWaterfall]:NEEDS[Waterfall] { !MODULE[ModuleWaterfallFX] {} @@ -91,8 +91,8 @@ } -// GEM-60 GEM-63 -@PART[bluedog_Delta_GEM60|bluedog_Delta_GEM60XL]:BEFORE[ROWaterfall]:NEEDS[Waterfall] +// GEM-60 +@PART[bluedog_Delta_GEM60]:BEFORE[ROWaterfall]:NEEDS[Waterfall] { !MODULE[ModuleWaterfallFX] {} ROWaterfall