From b65ce4887aa833053fa4cab84b7ff14ef490dac5 Mon Sep 17 00:00:00 2001 From: Capkirk123 Date: Wed, 20 Mar 2024 18:52:16 -0400 Subject: [PATCH] NFA liftjets and R79 (#2340) --- GameData/RP-1/Tree/ECM-Engines.cfg | 7 + GameData/RP-1/Tree/ECM-Parts.cfg | 4 + GameData/RP-1/Tree/TREE-Engines.cfg | 206 ++++++++++++++++++ GameData/RP-1/Tree/TREE-Parts.cfg | 32 +++ .../Parts Browser/data/Engine_Config.json | 147 +++++++++++++ .../data/Near_Future_Aeronautics.json | 63 ++++++ .../Parts Browser/data/SXT__RO_Addition.json | 21 ++ 7 files changed, 480 insertions(+) diff --git a/GameData/RP-1/Tree/ECM-Engines.cfg b/GameData/RP-1/Tree/ECM-Engines.cfg index f7584029b53..5b1b971ccfd 100644 --- a/GameData/RP-1/Tree/ECM-Engines.cfg +++ b/GameData/RP-1/Tree/ECM-Engines.cfg @@ -474,6 +474,12 @@ R-4D-11 = 0 R-4D-15 = 0 R-4D-15DM = 0 + R-79-300 = 75000,R-25-300 + R-79M-300 = 25000,R-79V-300 + R-79V-300 = 10000,R-79-300 + RB162-31 = 5000,Avon107 + RB162-4D = 500,RB162-31 + RB162-81 = 2500,RB162-31 RD-0105 = R7-Uppers RD-0106 = 2000,RD-0107 RD-0107 = R7-Vacuum, 5000 @@ -605,6 +611,7 @@ RD-277M-14D16M = 20000,RD-275M,RD-277-14D16 RD-301 = 100000,StagedHypergolic RD-36-51A = 70000,RD-9BF-811 + RD-41 = 30000 RD-500 = DerwentV RD-56 = 20000, StagedHydrolox RD-57 = 20000, RD-56 diff --git a/GameData/RP-1/Tree/ECM-Parts.cfg b/GameData/RP-1/Tree/ECM-Parts.cfg index 43a129412cd..640524a9a67 100644 --- a/GameData/RP-1/Tree/ECM-Parts.cfg +++ b/GameData/RP-1/Tree/ECM-Parts.cfg @@ -449,6 +449,7 @@ RO-SPT70 = SPT-70 RO-STAR-37 = STAR-37FM RO-SWPlasmaAnalyzer = 5000,RO-PlasmaWave + RO-SXT-R79 = R-79-300 RO-Sapphire203 = Sapphire101 RO-ScintillationCounter = 2500 RO-SurveyorVernier = TD-339 @@ -463,6 +464,7 @@ RO-ionSPT60 = SPT-60 RO-jt8d1 = JT8D-1 RO-model304 = Model304-2 + RO-nfa-RD41 = RD-41 RO-nflv-rcs-aero-heavy-1-half = 1 RO-nflv-rcs-aero-heavy-1-quarter = 1 RO-nflv-rcs-aero-heavy-2-half = 1 @@ -1545,6 +1547,8 @@ ndsport3 = NASADock nfa-turbofan-25-2 = Olympus593-610 nfa-turbojet-25-1 = GE4-J5P + nfa-vtol-0625-1 = RB162-31 + nfa-vtol-125-1 = RB162-31 nflv-engine-ar1-1 = AR-1 nflv-engine-ar1c-1 = AR-1 nflv-engine-m1d-1 = Merlin1D diff --git a/GameData/RP-1/Tree/TREE-Engines.cfg b/GameData/RP-1/Tree/TREE-Engines.cfg index b52ee2eb2c0..95d336a542c 100644 --- a/GameData/RP-1/Tree/TREE-Engines.cfg +++ b/GameData/RP-1/Tree/TREE-Engines.cfg @@ -3075,6 +3075,46 @@ *@PARTUPGRADE[RFUpgrade_R-4D-15DM]/deleteme -= 1 } + @CONFIG[R-79-300] + { + %techRequired = refinedTurbofans + %cost = 0 + } + + @CONFIG[R-79M-300] + { + %techRequired = refinedTurbofans + %cost = 52 + *@PARTUPGRADE[RFUpgrade_R-79M-300]/deleteme -= 1 + } + + @CONFIG[R-79V-300] + { + %techRequired = refinedTurbofans + %cost = 19 + *@PARTUPGRADE[RFUpgrade_R-79V-300]/deleteme -= 1 + } + + @CONFIG[RB162-31] + { + %techRequired = advancedJetEngines + %cost = 0 + } + + @CONFIG[RB162-4D] + { + %techRequired = advancedJetEngines + %cost = -9 + *@PARTUPGRADE[RFUpgrade_RB162-4D]/deleteme -= 1 + } + + @CONFIG[RB162-81] + { + %techRequired = efficientSupersonic + %cost = 0 + *@PARTUPGRADE[RFUpgrade_RB162-81]/deleteme -= 1 + } + @CONFIG[RD-0105] { %techRequired = orbitalRocketry1958 @@ -3962,6 +4002,12 @@ %cost = 0 } + @CONFIG[RD-41] + { + %techRequired = refinedTurbofans + %cost = 0 + } + @CONFIG[RD-500] { %techRequired = unlockParts @@ -15642,6 +15688,166 @@ PART { } +PARTUPGRADE +{ + name = RFUpgrade_R-79M-300 + partIcon = RO-H1-RS27 // FIXME Once we get dedicated model + techRequired = refinedTurbofans + entryCost = 0 + cost = 0 + title = R79 Engine Upgrade: R-79M-300 Config + basicInfo = Engine Performance Upgrade + manufacturer = Engine Upgrade + deleteme = 1 + description = The R79 Engine now supports the R-79M-300 configuration for increased performance. Unlock it in the VAB/SPH through the engine configs interface.\n\n +} + +PART +{ + name = RFUpgrade_engineConfigSource_R-79M-300 + engineType = R79 +} + +@PART[RFUpgrade_engineConfigSource_R-79M-300]:AFTER[RealismOverhaulEngines] +{ + %MODULE[Module*EngineConfigs] { + @name = ModuleEngineConfigs + %CONFIG[R-79M-300] { + &specLevel = operational + } + } +} + +@PARTUPGRADE[RFUpgrade_R-79M-300]:AFTER[RealismOverhaulEngines] +{ + %description = #$description$\nAvailable at specLevel $@PART[RFUpgrade_engineConfigSource_R-79M-300]/MODULE[ModuleEngineConfigs]/CONFIG[R-79M-300]/specLevel$ + // TODO: could add any number of other useful fields from the CONFIG here. cost? description? +} + +!PART[RFUpgrade_engineConfigSource_R-79M-300]:AFTER[RealismOverhaulEngines] +{ +} + +PARTUPGRADE +{ + name = RFUpgrade_R-79V-300 + partIcon = RO-H1-RS27 // FIXME Once we get dedicated model + techRequired = refinedTurbofans + entryCost = 0 + cost = 0 + title = R79 Engine Upgrade: R-79V-300 Config + basicInfo = Engine Performance Upgrade + manufacturer = Engine Upgrade + deleteme = 1 + description = The R79 Engine now supports the R-79V-300 configuration for increased performance. Unlock it in the VAB/SPH through the engine configs interface.\n\n +} + +PART +{ + name = RFUpgrade_engineConfigSource_R-79V-300 + engineType = R79 +} + +@PART[RFUpgrade_engineConfigSource_R-79V-300]:AFTER[RealismOverhaulEngines] +{ + %MODULE[Module*EngineConfigs] { + @name = ModuleEngineConfigs + %CONFIG[R-79V-300] { + &specLevel = operational + } + } +} + +@PARTUPGRADE[RFUpgrade_R-79V-300]:AFTER[RealismOverhaulEngines] +{ + %description = #$description$\nAvailable at specLevel $@PART[RFUpgrade_engineConfigSource_R-79V-300]/MODULE[ModuleEngineConfigs]/CONFIG[R-79V-300]/specLevel$ + // TODO: could add any number of other useful fields from the CONFIG here. cost? description? +} + +!PART[RFUpgrade_engineConfigSource_R-79V-300]:AFTER[RealismOverhaulEngines] +{ +} + +PARTUPGRADE +{ + name = RFUpgrade_RB162-4D + partIcon = RO-H1-RS27 // FIXME Once we get dedicated model + techRequired = advancedJetEngines + entryCost = 0 + cost = 0 + title = RB162 Engine Upgrade: RB162-4D Config + basicInfo = Engine Performance Upgrade + manufacturer = Engine Upgrade + deleteme = 1 + description = The RB162 Engine now supports the RB162-4D configuration for increased performance. Unlock it in the VAB/SPH through the engine configs interface.\n\n +} + +PART +{ + name = RFUpgrade_engineConfigSource_RB162-4D + engineType = RB162 +} + +@PART[RFUpgrade_engineConfigSource_RB162-4D]:AFTER[RealismOverhaulEngines] +{ + %MODULE[Module*EngineConfigs] { + @name = ModuleEngineConfigs + %CONFIG[RB162-4D] { + &specLevel = operational + } + } +} + +@PARTUPGRADE[RFUpgrade_RB162-4D]:AFTER[RealismOverhaulEngines] +{ + %description = #$description$\nAvailable at specLevel $@PART[RFUpgrade_engineConfigSource_RB162-4D]/MODULE[ModuleEngineConfigs]/CONFIG[RB162-4D]/specLevel$ + // TODO: could add any number of other useful fields from the CONFIG here. cost? description? +} + +!PART[RFUpgrade_engineConfigSource_RB162-4D]:AFTER[RealismOverhaulEngines] +{ +} + +PARTUPGRADE +{ + name = RFUpgrade_RB162-81 + partIcon = RO-H1-RS27 // FIXME Once we get dedicated model + techRequired = efficientSupersonic + entryCost = 0 + cost = 0 + title = RB162 Engine Upgrade: RB162-81 Config + basicInfo = Engine Performance Upgrade + manufacturer = Engine Upgrade + deleteme = 1 + description = The RB162 Engine now supports the RB162-81 configuration for increased performance. Unlock it in the VAB/SPH through the engine configs interface.\n\n +} + +PART +{ + name = RFUpgrade_engineConfigSource_RB162-81 + engineType = RB162 +} + +@PART[RFUpgrade_engineConfigSource_RB162-81]:AFTER[RealismOverhaulEngines] +{ + %MODULE[Module*EngineConfigs] { + @name = ModuleEngineConfigs + %CONFIG[RB162-81] { + &specLevel = operational + } + } +} + +@PARTUPGRADE[RFUpgrade_RB162-81]:AFTER[RealismOverhaulEngines] +{ + %description = #$description$\nAvailable at specLevel $@PART[RFUpgrade_engineConfigSource_RB162-81]/MODULE[ModuleEngineConfigs]/CONFIG[RB162-81]/specLevel$ + // TODO: could add any number of other useful fields from the CONFIG here. cost? description? +} + +!PART[RFUpgrade_engineConfigSource_RB162-81]:AFTER[RealismOverhaulEngines] +{ +} + PARTUPGRADE { name = RFUpgrade_RD-0106 diff --git a/GameData/RP-1/Tree/TREE-Parts.cfg b/GameData/RP-1/Tree/TREE-Parts.cfg index c0cd3f9d440..a0d8e49a52b 100644 --- a/GameData/RP-1/Tree/TREE-Parts.cfg +++ b/GameData/RP-1/Tree/TREE-Parts.cfg @@ -7042,6 +7042,14 @@ %MODULE[ModuleTagList] { tag = Instruments } } +@PART[RO-SXT-R79]:FOR[xxxRP0] +{ + %TechRequired = refinedTurbofans + %cost = 743 + %entryCost = 0 + RP0conf = true + @description ^=:$: From SXT (RO Addition) mod +} @PART[RO-Sapphire203]:FOR[xxxRP0] { %TechRequired = supersonicFlightRP0 @@ -7219,6 +7227,14 @@ RP0conf = true @description ^=:$: From Advanced Jet Engines mod } +@PART[RO-nfa-RD41]:FOR[xxxRP0] +{ + %TechRequired = refinedTurbofans + %cost = 456 + %entryCost = 0 + RP0conf = true + @description ^=:$: From Near Future Aeronautics mod +} @PART[RO-nflv-rcs-aero-heavy-1-half]:FOR[xxxRP0] { %TechRequired = unlockParts @@ -25458,6 +25474,22 @@ RP0conf = true @description ^=:$: From Near Future Aeronautics mod } +@PART[nfa-vtol-0625-1]:FOR[xxxRP0] +{ + %TechRequired = advancedJetEngines + %cost = 161 + %entryCost = 0 + RP0conf = true + @description ^=:$: From Near Future Aeronautics mod +} +@PART[nfa-vtol-125-1]:FOR[xxxRP0] +{ + %TechRequired = advancedJetEngines + %cost = 322 + %entryCost = 0 + RP0conf = true + @description ^=:$: From Near Future Aeronautics mod +} @PART[nfex-antenna-deploy-wv3-1]:FOR[xxxRP0] { %TechRequired = interplanetaryComms diff --git a/Source/Tech Tree/Parts Browser/data/Engine_Config.json b/Source/Tech Tree/Parts Browser/data/Engine_Config.json index 00a25c313cc..6d175cd1a9c 100644 --- a/Source/Tech Tree/Parts Browser/data/Engine_Config.json +++ b/Source/Tech Tree/Parts Browser/data/Engine_Config.json @@ -10214,6 +10214,132 @@ "identical_part_name": "", "module_tags": [] }, + { + "name": "R-79-300", + "title": "R-79-300", + "description": "", + "mod": "Engine_Config", + "cost": "0", + "entry_cost": "0", + "category": "FLIGHT", + "info": "", + "year": "1986", + "technology": "refinedTurbofans", + "ro": true, + "orphan": false, + "rp0_conf": true, + "spacecraft": "", + "engine_config": "R79", + "upgrade": false, + "entry_cost_mods": "75000,R-25-300", + "identical_part_name": "", + "module_tags": [] + }, + { + "name": "R-79M-300", + "title": "R-79M-300", + "description": "", + "mod": "Engine_Config", + "cost": "52", + "entry_cost": "0", + "category": "FLIGHT", + "info": "", + "year": "1997", + "technology": "refinedTurbofans", + "ro": true, + "orphan": false, + "rp0_conf": true, + "spacecraft": "", + "engine_config": "R79", + "upgrade": true, + "entry_cost_mods": "25000,R-79V-300", + "identical_part_name": "", + "module_tags": [] + }, + { + "name": "R-79V-300", + "title": "R-79V-300", + "description": "", + "mod": "Engine_Config", + "cost": "19", + "entry_cost": "0", + "category": "FLIGHT", + "info": "", + "year": "1987", + "technology": "refinedTurbofans", + "ro": true, + "orphan": false, + "rp0_conf": true, + "spacecraft": "", + "engine_config": "R79", + "upgrade": true, + "entry_cost_mods": "10000,R-79-300", + "identical_part_name": "", + "module_tags": [] + }, + { + "name": "RB162-31", + "title": "RB162-31", + "description": "", + "mod": "Engine_Config", + "cost": "0", + "entry_cost": "0", + "category": "FLIGHT", + "info": "", + "year": "1965", + "technology": "advancedJetEngines", + "ro": true, + "orphan": false, + "rp0_conf": true, + "spacecraft": "", + "engine_config": "RB162", + "upgrade": false, + "entry_cost_mods": "5000,Avon107", + "identical_part_name": "", + "module_tags": [] + }, + { + "name": "RB162-4D", + "title": "RB162-4D", + "description": "", + "mod": "Engine_Config", + "cost": -9, + "entry_cost": "0", + "category": "FLIGHT", + "info": "", + "year": "1967", + "technology": "advancedJetEngines", + "ro": true, + "orphan": false, + "rp0_conf": true, + "spacecraft": "", + "engine_config": "RB162", + "upgrade": true, + "entry_cost_mods": "500,RB162-31", + "identical_part_name": "", + "module_tags": [] + }, + { + "name": "RB162-81", + "title": "RB162-81", + "description": "", + "mod": "Engine_Config", + "cost": "0", + "entry_cost": "0", + "category": "FLIGHT", + "info": "", + "year": "1971", + "technology": "efficientSupersonic", + "ro": true, + "orphan": false, + "rp0_conf": true, + "spacecraft": "", + "engine_config": "RB162", + "upgrade": true, + "entry_cost_mods": "2500,RB162-31", + "identical_part_name": "", + "module_tags": [] + }, { "name": "RD-0105", "title": "RD-0105", @@ -13116,6 +13242,27 @@ "identical_part_name": "", "module_tags": [] }, + { + "name": "RD-41", + "title": "RD-41", + "description": "", + "mod": "Engine_Config", + "cost": "0", + "entry_cost": "0", + "category": "FLIGHT", + "info": "", + "year": "1987", + "technology": "refinedTurbofans", + "ro": true, + "orphan": false, + "rp0_conf": true, + "spacecraft": "", + "engine_config": "RD41", + "upgrade": false, + "entry_cost_mods": "30000", + "identical_part_name": "", + "module_tags": [] + }, { "name": "RD-500", "title": "RD-500", diff --git a/Source/Tech Tree/Parts Browser/data/Near_Future_Aeronautics.json b/Source/Tech Tree/Parts Browser/data/Near_Future_Aeronautics.json index 37364aaac75..ed76750344a 100644 --- a/Source/Tech Tree/Parts Browser/data/Near_Future_Aeronautics.json +++ b/Source/Tech Tree/Parts Browser/data/Near_Future_Aeronautics.json @@ -1,4 +1,25 @@ [ + { + "name": "RO-nfa-RD41", + "title": "2x RD-41 Turbojet", + "description": "", + "mod": "Near Future Aeronautics", + "cost": "456", + "entry_cost": "0", + "category": "FLIGHT", + "info": "", + "year": "1987", + "technology": "refinedTurbofans", + "ro": true, + "orphan": false, + "rp0_conf": true, + "spacecraft": "", + "engine_config": "RD41", + "upgrade": false, + "entry_cost_mods": "RD-41", + "identical_part_name": "", + "module_tags": [] + }, { "name": "nfa-turbofan-25-2", "title": "Olympus 593 Turbojet", @@ -40,5 +61,47 @@ "entry_cost_mods": "GE4-J5P", "identical_part_name": "", "module_tags": [] + }, + { + "name": "nfa-vtol-0625-1", + "title": "RB.162 Turbojet", + "description": "", + "mod": "Near Future Aeronautics", + "cost": "161", + "entry_cost": "0", + "category": "FLIGHT", + "info": "", + "year": "1965", + "technology": "advancedJetEngines", + "ro": true, + "orphan": false, + "rp0_conf": true, + "spacecraft": "", + "engine_config": "RB162", + "upgrade": false, + "entry_cost_mods": "RB162-31", + "identical_part_name": "", + "module_tags": [] + }, + { + "name": "nfa-vtol-125-1", + "title": "2x RB.162 Turbojet", + "description": "", + "mod": "Near Future Aeronautics", + "cost": "322", + "entry_cost": "0", + "category": "FLIGHT", + "info": "", + "year": "1965", + "technology": "advancedJetEngines", + "ro": true, + "orphan": false, + "rp0_conf": true, + "spacecraft": "", + "engine_config": "RB162", + "upgrade": false, + "entry_cost_mods": "RB162-31", + "identical_part_name": "", + "module_tags": [] } ] \ No newline at end of file diff --git a/Source/Tech Tree/Parts Browser/data/SXT__RO_Addition.json b/Source/Tech Tree/Parts Browser/data/SXT__RO_Addition.json index 61dfc41bcc2..a9a93b97866 100644 --- a/Source/Tech Tree/Parts Browser/data/SXT__RO_Addition.json +++ b/Source/Tech Tree/Parts Browser/data/SXT__RO_Addition.json @@ -69,6 +69,27 @@ "identical_part_name": "", "module_tags": [] }, + { + "name": "RO-SXT-R79", + "title": "R-79 Low-Bypass Turbofan", + "description": "", + "mod": "SXT (RO Addition)", + "cost": "743", + "entry_cost": "0", + "category": "FLIGHT", + "info": "", + "year": "1986", + "technology": "refinedTurbofans", + "ro": true, + "orphan": false, + "rp0_conf": true, + "spacecraft": "", + "engine_config": "R79", + "upgrade": false, + "entry_cost_mods": "R-79-300", + "identical_part_name": "", + "module_tags": [] + }, { "name": "RO-VK1", "title": "VK-1 Turbojet",