From a1fd38301e1358c3d12dc695fd47084935395f70 Mon Sep 17 00:00:00 2001 From: Capkirk123 Date: Mon, 5 Aug 2024 18:34:39 -0400 Subject: [PATCH] More RL10 versions --- GameData/RP-1/Tree/ECM-Engines.cfg | 11 +- GameData/RP-1/Tree/TREE-Engines.cfg | 189 +++++++++++++++--- .../Parts Browser/data/Engine_Config.json | 99 +++++++-- 3 files changed, 253 insertions(+), 46 deletions(-) diff --git a/GameData/RP-1/Tree/ECM-Engines.cfg b/GameData/RP-1/Tree/ECM-Engines.cfg index f54c9d9093f..005f4de7972 100644 --- a/GameData/RP-1/Tree/ECM-Engines.cfg +++ b/GameData/RP-1/Tree/ECM-Engines.cfg @@ -659,10 +659,13 @@ RL10A-5 = 3469,RL10A-4,throttlingTP RL10B-2 = 80000,RL10A-4-1-2 RL10C-1 = 60000,RL10A-4-1-2 - RL10C-1-1 = 45000,RL10C-1 - RL10C-2-1 = 45000,RL10B-2 - RL10C-3 = 50000,RL10B-2 - RL10C-X = 25000,RL10C-3,RL10C-1-1 + RL10C-1-1 = 22500,RL10C-1A + RL10C-1A = 22500,RL10C-1 + RL10C-2 = 45000,RL10B-2 + RL10C-2-1 = 22500,RL10B-2,RL10C-1 + RL10C-3 = 50000,RL10C-2 + RL10E-1 = 25000,RL10C-3,RL10C-1-1 + RL10E-3EL = 100000,RL10E-1 RL200-200k = 146000,RL10A-3-1 RL200-225k = 20000,RL200-200k RL200-230k = 5000,RL200-225k diff --git a/GameData/RP-1/Tree/TREE-Engines.cfg b/GameData/RP-1/Tree/TREE-Engines.cfg index 506b95f3055..b16eac69e8b 100644 --- a/GameData/RP-1/Tree/TREE-Engines.cfg +++ b/GameData/RP-1/Tree/TREE-Engines.cfg @@ -704,7 +704,7 @@ @CONFIG[CECE-High] { %techRequired = hydrolox2014 - %cost = 572 + %cost = 568 *@PARTUPGRADE[RFUpgrade_CECE-High]/deleteme -= 1 } @@ -4269,14 +4269,14 @@ @CONFIG[RL10A-4] { %techRequired = hydrolox1992 - %cost = 230 + %cost = 241 *@PARTUPGRADE[RFUpgrade_RL10A-4]/deleteme -= 1 } @CONFIG[RL10A-4-1-2] { %techRequired = hydrolox1998 - %cost = 231 + %cost = 244 *@PARTUPGRADE[RFUpgrade_RL10A-4-1-2]/deleteme -= 1 } @@ -4311,43 +4311,64 @@ @CONFIG[RL10B-2] { %techRequired = hydrolox1998 - %cost = 596 + %cost = 635 *@PARTUPGRADE[RFUpgrade_RL10B-2]/deleteme -= 1 } @CONFIG[RL10C-1] { %techRequired = hydrolox2014 - %cost = 340 + %cost = 331 *@PARTUPGRADE[RFUpgrade_RL10C-1]/deleteme -= 1 } @CONFIG[RL10C-1-1] { %techRequired = hydrolox2019 - %cost = 360 + %cost = 363 *@PARTUPGRADE[RFUpgrade_RL10C-1-1]/deleteme -= 1 } + @CONFIG[RL10C-1A] + { + %techRequired = hydrolox2014 + %cost = 366 + *@PARTUPGRADE[RFUpgrade_RL10C-1A]/deleteme -= 1 + } + + @CONFIG[RL10C-2] + { + %techRequired = hydrolox2019 + %cost = 649 + *@PARTUPGRADE[RFUpgrade_RL10C-2]/deleteme -= 1 + } + @CONFIG[RL10C-2-1] { %techRequired = hydrolox2019 - %cost = 602 + %cost = 642 *@PARTUPGRADE[RFUpgrade_RL10C-2-1]/deleteme -= 1 } @CONFIG[RL10C-3] { - %techRequired = hydrolox2019 - %cost = 479 + %techRequired = hydroloxNF + %cost = 460 *@PARTUPGRADE[RFUpgrade_RL10C-3]/deleteme -= 1 } - @CONFIG[RL10C-X] + @CONFIG[RL10E-1] { - %techRequired = hydrolox2019 - %cost = 487 - *@PARTUPGRADE[RFUpgrade_RL10C-X]/deleteme -= 1 + %techRequired = hydroloxNF + %cost = 480 + *@PARTUPGRADE[RFUpgrade_RL10E-1]/deleteme -= 1 + } + + @CONFIG[RL10E-3EL] + { + %techRequired = hydroloxNF + %cost = 638 + *@PARTUPGRADE[RFUpgrade_RL10E-3EL]/deleteme -= 1 } @CONFIG[RL200-200k] @@ -20476,6 +20497,86 @@ PART { } +PARTUPGRADE +{ + name = RFUpgrade_RL10C-1A + partIcon = RO-H1-RS27 // FIXME Once we get dedicated model + techRequired = hydrolox2014 + entryCost = 0 + cost = 0 + title = RL10 Engine Upgrade: RL10C-1A Config + basicInfo = Engine Performance Upgrade + manufacturer = Engine Upgrade + deleteme = 1 + description = The RL10 Engine now supports the RL10C-1A configuration for increased performance. Unlock it in the VAB/SPH through the engine configs interface.\n\n +} + +PART +{ + name = RFUpgrade_engineConfigSource_RL10C-1A + engineType = RL10 +} + +@PART[RFUpgrade_engineConfigSource_RL10C-1A]:AFTER[RealismOverhaulEngines] +{ + %MODULE[Module*EngineConfigs] { + @name = ModuleEngineConfigs + %CONFIG[RL10C-1A] { + &specLevel = operational + } + } +} + +@PARTUPGRADE[RFUpgrade_RL10C-1A]:AFTER[RealismOverhaulEngines] +{ + %description = #$description$\nAvailable at specLevel $@PART[RFUpgrade_engineConfigSource_RL10C-1A]/MODULE[ModuleEngineConfigs]/CONFIG[RL10C-1A]/specLevel$ + // TODO: could add any number of other useful fields from the CONFIG here. cost? description? +} + +!PART[RFUpgrade_engineConfigSource_RL10C-1A]:AFTER[RealismOverhaulEngines] +{ +} + +PARTUPGRADE +{ + name = RFUpgrade_RL10C-2 + partIcon = RO-H1-RS27 // FIXME Once we get dedicated model + techRequired = hydrolox2019 + entryCost = 0 + cost = 0 + title = RL10 Engine Upgrade: RL10C-2 Config + basicInfo = Engine Performance Upgrade + manufacturer = Engine Upgrade + deleteme = 1 + description = The RL10 Engine now supports the RL10C-2 configuration for increased performance. Unlock it in the VAB/SPH through the engine configs interface.\n\n +} + +PART +{ + name = RFUpgrade_engineConfigSource_RL10C-2 + engineType = RL10 +} + +@PART[RFUpgrade_engineConfigSource_RL10C-2]:AFTER[RealismOverhaulEngines] +{ + %MODULE[Module*EngineConfigs] { + @name = ModuleEngineConfigs + %CONFIG[RL10C-2] { + &specLevel = operational + } + } +} + +@PARTUPGRADE[RFUpgrade_RL10C-2]:AFTER[RealismOverhaulEngines] +{ + %description = #$description$\nAvailable at specLevel $@PART[RFUpgrade_engineConfigSource_RL10C-2]/MODULE[ModuleEngineConfigs]/CONFIG[RL10C-2]/specLevel$ + // TODO: could add any number of other useful fields from the CONFIG here. cost? description? +} + +!PART[RFUpgrade_engineConfigSource_RL10C-2]:AFTER[RealismOverhaulEngines] +{ +} + PARTUPGRADE { name = RFUpgrade_RL10C-2-1 @@ -20520,7 +20621,7 @@ PARTUPGRADE { name = RFUpgrade_RL10C-3 partIcon = RO-H1-RS27 // FIXME Once we get dedicated model - techRequired = hydrolox2019 + techRequired = hydroloxNF entryCost = 0 cost = 0 title = RL10 Engine Upgrade: RL10C-3 Config @@ -20558,41 +20659,81 @@ PART PARTUPGRADE { - name = RFUpgrade_RL10C-X + name = RFUpgrade_RL10E-1 partIcon = RO-H1-RS27 // FIXME Once we get dedicated model - techRequired = hydrolox2019 + techRequired = hydroloxNF + entryCost = 0 + cost = 0 + title = RL10 Engine Upgrade: RL10E-1 Config + basicInfo = Engine Performance Upgrade + manufacturer = Engine Upgrade + deleteme = 1 + description = The RL10 Engine now supports the RL10E-1 configuration for increased performance. Unlock it in the VAB/SPH through the engine configs interface.\n\n +} + +PART +{ + name = RFUpgrade_engineConfigSource_RL10E-1 + engineType = RL10 +} + +@PART[RFUpgrade_engineConfigSource_RL10E-1]:AFTER[RealismOverhaulEngines] +{ + %MODULE[Module*EngineConfigs] { + @name = ModuleEngineConfigs + %CONFIG[RL10E-1] { + &specLevel = operational + } + } +} + +@PARTUPGRADE[RFUpgrade_RL10E-1]:AFTER[RealismOverhaulEngines] +{ + %description = #$description$\nAvailable at specLevel $@PART[RFUpgrade_engineConfigSource_RL10E-1]/MODULE[ModuleEngineConfigs]/CONFIG[RL10E-1]/specLevel$ + // TODO: could add any number of other useful fields from the CONFIG here. cost? description? +} + +!PART[RFUpgrade_engineConfigSource_RL10E-1]:AFTER[RealismOverhaulEngines] +{ +} + +PARTUPGRADE +{ + name = RFUpgrade_RL10E-3EL + partIcon = RO-H1-RS27 // FIXME Once we get dedicated model + techRequired = hydroloxNF entryCost = 0 cost = 0 - title = RL10 Engine Upgrade: RL10C-X Config + title = RL10 Engine Upgrade: RL10E-3EL Config basicInfo = Engine Performance Upgrade manufacturer = Engine Upgrade deleteme = 1 - description = The RL10 Engine now supports the RL10C-X configuration for increased performance. Unlock it in the VAB/SPH through the engine configs interface.\n\n + description = The RL10 Engine now supports the RL10E-3EL configuration for increased performance. Unlock it in the VAB/SPH through the engine configs interface.\n\n } PART { - name = RFUpgrade_engineConfigSource_RL10C-X + name = RFUpgrade_engineConfigSource_RL10E-3EL engineType = RL10 } -@PART[RFUpgrade_engineConfigSource_RL10C-X]:AFTER[RealismOverhaulEngines] +@PART[RFUpgrade_engineConfigSource_RL10E-3EL]:AFTER[RealismOverhaulEngines] { %MODULE[Module*EngineConfigs] { @name = ModuleEngineConfigs - %CONFIG[RL10C-X] { + %CONFIG[RL10E-3EL] { &specLevel = operational } } } -@PARTUPGRADE[RFUpgrade_RL10C-X]:AFTER[RealismOverhaulEngines] +@PARTUPGRADE[RFUpgrade_RL10E-3EL]:AFTER[RealismOverhaulEngines] { - %description = #$description$\nAvailable at specLevel $@PART[RFUpgrade_engineConfigSource_RL10C-X]/MODULE[ModuleEngineConfigs]/CONFIG[RL10C-X]/specLevel$ + %description = #$description$\nAvailable at specLevel $@PART[RFUpgrade_engineConfigSource_RL10E-3EL]/MODULE[ModuleEngineConfigs]/CONFIG[RL10E-3EL]/specLevel$ // TODO: could add any number of other useful fields from the CONFIG here. cost? description? } -!PART[RFUpgrade_engineConfigSource_RL10C-X]:AFTER[RealismOverhaulEngines] +!PART[RFUpgrade_engineConfigSource_RL10E-3EL]:AFTER[RealismOverhaulEngines] { } diff --git a/Source/Tech Tree/Parts Browser/data/Engine_Config.json b/Source/Tech Tree/Parts Browser/data/Engine_Config.json index 3f450f55351..85dbc595d9e 100644 --- a/Source/Tech Tree/Parts Browser/data/Engine_Config.json +++ b/Source/Tech Tree/Parts Browser/data/Engine_Config.json @@ -2274,7 +2274,7 @@ "title": "CECE-High", "description": "", "mod": "Engine_Config", - "cost": 572, + "cost": 568, "entry_cost": 0, "category": "HYDROLOX", "info": "", @@ -14119,7 +14119,7 @@ "title": "RL10A-4", "description": "", "mod": "Engine_Config", - "cost": 230, + "cost": 241, "entry_cost": 0, "category": "HYDROLOX", "info": "", @@ -14141,7 +14141,7 @@ "title": "RL10A-4-1/2", "description": "", "mod": "Engine_Config", - "cost": 231, + "cost": 244, "entry_cost": 0, "category": "HYDROLOX", "info": "", @@ -14251,7 +14251,7 @@ "title": "RL10B-2", "description": "", "mod": "Engine_Config", - "cost": 596, + "cost": 635, "entry_cost": 0, "category": "HYDROLOX", "info": "", @@ -14273,7 +14273,7 @@ "title": "RL10C-1", "description": "", "mod": "Engine_Config", - "cost": 340, + "cost": 331, "entry_cost": 0, "category": "HYDROLOX", "info": "", @@ -14295,7 +14295,7 @@ "title": "RL10C-1-1", "description": "", "mod": "Engine_Config", - "cost": 360, + "cost": 363, "entry_cost": 0, "category": "HYDROLOX", "info": "", @@ -14308,7 +14308,49 @@ "spacecraft": "Vulcan", "engine_config": "RL10", "upgrade": true, - "entry_cost_mods": "45000,RL10C-1", + "entry_cost_mods": "22500,RL10C-1A", + "identical_part_name": "", + "module_tags": [] + }, + { + "name": "RL10C-1A", + "title": "RL10C-1A", + "description": "", + "mod": "Engine_Config", + "cost": 366, + "entry_cost": "0", + "category": "HYDROLOX", + "info": "", + "year": "2018", + "technology": "hydrolox2014", + "ro": true, + "orphan": false, + "rp0_conf": true, + "spacecraft": "", + "engine_config": "RL10", + "upgrade": true, + "entry_cost_mods": "22500,RL10C-1", + "identical_part_name": "", + "module_tags": [] + }, + { + "name": "RL10C-2", + "title": "RL10C-2", + "description": "", + "mod": "Engine_Config", + "cost": 649, + "entry_cost": "0", + "category": "HYDROLOX", + "info": "", + "year": "2022", + "technology": "hydrolox2019", + "ro": true, + "orphan": false, + "rp0_conf": true, + "spacecraft": "", + "engine_config": "RL10", + "upgrade": true, + "entry_cost_mods": "45000,RL10B-2", "identical_part_name": "", "module_tags": [] }, @@ -14317,7 +14359,7 @@ "title": "RL10C-2-1", "description": "", "mod": "Engine_Config", - "cost": 602, + "cost": 642, "entry_cost": 0, "category": "HYDROLOX", "info": "", @@ -14330,7 +14372,7 @@ "spacecraft": "Delta IV", "engine_config": "RL10", "upgrade": true, - "entry_cost_mods": "45000,RL10B-2", + "entry_cost_mods": "22500,RL10B-2,RL10C-1", "identical_part_name": "", "module_tags": [] }, @@ -14339,12 +14381,12 @@ "title": "RL10C-3", "description": "", "mod": "Engine_Config", - "cost": 479, + "cost": 460, "entry_cost": 0, "category": "HYDROLOX", "info": "", - "year": "2024", - "technology": "hydrolox2019", + "year": "2029", + "technology": "hydroloxNF", "era": "", "ro": true, "orphan": false, @@ -14352,21 +14394,21 @@ "spacecraft": "SLS", "engine_config": "RL10", "upgrade": true, - "entry_cost_mods": "50000,RL10B-2", + "entry_cost_mods": "50000,RL10C-2", "identical_part_name": "", "module_tags": [] }, { - "name": "RL10C-X", - "title": "RL10C-X", + "name": "RL10E-1", + "title": "RL10E-1", "description": "", "mod": "Engine_Config", - "cost": 487, + "cost": 480, "entry_cost": "0", "category": "HYDROLOX", "info": "", - "year": "2024", - "technology": "hydrolox2019", + "year": "2029", + "technology": "hydroloxNF", "ro": true, "orphan": false, "rp0_conf": true, @@ -14377,6 +14419,27 @@ "identical_part_name": "", "module_tags": [] }, + { + "name": "RL10E-3EL", + "title": "RL10E-3EL", + "description": "", + "mod": "Engine_Config", + "cost": "638", + "entry_cost": "0", + "category": "HYDROLOX", + "info": "", + "year": "2030", + "technology": "hydroloxNF", + "ro": true, + "orphan": false, + "rp0_conf": true, + "spacecraft": "", + "engine_config": "RL10", + "upgrade": true, + "entry_cost_mods": "100000,RL10E-1", + "identical_part_name": "", + "module_tags": [] + }, { "name": "RL200-200k", "title": "RL200-200k",