diff --git a/GameData/RP-1/Tree/ECM-Engines.cfg b/GameData/RP-1/Tree/ECM-Engines.cfg index c62daf766b..2021446812 100644 --- a/GameData/RP-1/Tree/ECM-Engines.cfg +++ b/GameData/RP-1/Tree/ECM-Engines.cfg @@ -464,13 +464,16 @@ PrincetonLNTR-WCH = 250000,PrincetonLNTR-ZrC PrincetonLNTR-ZrC = 250000,LiquidCoreReactors R-103 = 0 - R-11F-300 = 2000,RD-9BF + R-11F-300 = 2000,RD-9BF-811 R-11F2-300 = 2500,R-11F-300 R-11F2S-300 = 2000,R-11F2-300 - R-15B-300 = 20000,RD-9BF + R-13-300 = 2000,R-11F2S-300 + R-13F-300 = 2000,R-13-300 + R-13F2-300 = 2000,R-13F-300 + R-15B-300 = 20000,RD-9BF-811 R-15BD-300 = 5000,R-15B-300 R-15BF2-300 = 20000,R-15BD-300 - R-25-300 = 1000,R-11F2S-300 + R-25-300 = 1000,R-13F-300 R-40A = 0 R-40A-NTO = 0 R-40B = 0 @@ -848,6 +851,10 @@ Vulcain = 320000,HydroloxPumps Vulcain-2 = 50000 WAC-Corporal = 1 + WP-13 = 2000,R-13-300,WP-7B + WP-13A-II = 2000,WP-13 + WP-13F = 2000,WP-13A-II + WP-13FI = 2000,WP-13F WP-6 = 250,RD-9B WP-6A = 500,RD-9BF-811 WP-6A-III = 2000,WP-6A @@ -858,7 +865,7 @@ WP-7BM = 2000,WP-7B WS-10A = 15000,CFM56-2A2 WS-10B = 5000,WS-10A - WS-10B-III = 5000,WP-7B + WS-10B-III = 5000,WS-10B Waxwing = 10000, SolidsCTPB Welland = 1 X-405 = 9500,XLR10-RM-2,Navaho-PhaseIII-TP diff --git a/GameData/RP-1/Tree/ECM-Parts.cfg b/GameData/RP-1/Tree/ECM-Parts.cfg index e916c016c2..cf57bfd7e6 100644 --- a/GameData/RP-1/Tree/ECM-Parts.cfg +++ b/GameData/RP-1/Tree/ECM-Parts.cfg @@ -406,6 +406,7 @@ RO-PPS1350 = PPS-1350 RO-QuadropoleMassSpectrometer = 2500, RO-MIMS RO-R11F = R-11F-300 + RO-R13 = R-13-300 RO-R15BD = R-15B-300 RO-R25F = R-25-300 RO-RD-0105 = RD-0105 diff --git a/GameData/RP-1/Tree/TREE-Engines.cfg b/GameData/RP-1/Tree/TREE-Engines.cfg index 50312dbe3a..2d31fd9d02 100644 --- a/GameData/RP-1/Tree/TREE-Engines.cfg +++ b/GameData/RP-1/Tree/TREE-Engines.cfg @@ -3034,6 +3034,26 @@ *@PARTUPGRADE[RFUpgrade_R-11F2S-300]/deleteme -= 1 } + @CONFIG[R-13-300] + { + %techRequired = advancedJetEngines + %cost = 0 + } + + @CONFIG[R-13F-300] + { + %techRequired = efficientSupersonic + %cost = 2 + *@PARTUPGRADE[RFUpgrade_R-13F-300]/deleteme -= 1 + } + + @CONFIG[R-13F2-300] + { + %techRequired = efficientSupersonic + %cost = 2 + *@PARTUPGRADE[RFUpgrade_R-13F2-300]/deleteme -= 1 + } + @CONFIG[R-15B-300] { %techRequired = advancedJetEngines @@ -5543,6 +5563,34 @@ %cost = 0 } + @CONFIG[WP-13] + { + %techRequired = matureTurbofans + %cost = -15 + *@PARTUPGRADE[RFUpgrade_WP-13]/deleteme -= 1 + } + + @CONFIG[WP-13A-II] + { + %techRequired = refinedTurbofans + %cost = 14 + *@PARTUPGRADE[RFUpgrade_WP-13A-II]/deleteme -= 1 + } + + @CONFIG[WP-13F] + { + %techRequired = refinedTurbofans + %cost = 4 + *@PARTUPGRADE[RFUpgrade_WP-13F]/deleteme -= 1 + } + + @CONFIG[WP-13FI] + { + %techRequired = refinedTurbofans + %cost = 6 + *@PARTUPGRADE[RFUpgrade_WP-13FI]/deleteme -= 1 + } + @CONFIG[WP-6] { %techRequired = highSpeedFlight @@ -15869,6 +15917,86 @@ PART { } +PARTUPGRADE +{ + name = RFUpgrade_R-13F-300 + partIcon = RO-H1-RS27 // FIXME Once we get dedicated model + techRequired = efficientSupersonic + entryCost = 0 + cost = 0 + title = R13 Engine Upgrade: R-13F-300 Config + basicInfo = Engine Performance Upgrade + manufacturer = Engine Upgrade + deleteme = 1 + description = The R13 Engine now supports the R-13F-300 configuration for increased performance. Unlock it in the VAB/SPH through the engine configs interface.\n\n +} + +PART +{ + name = RFUpgrade_engineConfigSource_R-13F-300 + engineType = R13 +} + +@PART[RFUpgrade_engineConfigSource_R-13F-300]:AFTER[RealismOverhaulEngines] +{ + %MODULE[Module*EngineConfigs] { + @name = ModuleEngineConfigs + %CONFIG[R-13F-300] { + &specLevel = operational + } + } +} + +@PARTUPGRADE[RFUpgrade_R-13F-300]:AFTER[RealismOverhaulEngines] +{ + %description = #$description$\nAvailable at specLevel $@PART[RFUpgrade_engineConfigSource_R-13F-300]/MODULE[ModuleEngineConfigs]/CONFIG[R-13F-300]/specLevel$ + // TODO: could add any number of other useful fields from the CONFIG here. cost? description? +} + +!PART[RFUpgrade_engineConfigSource_R-13F-300]:AFTER[RealismOverhaulEngines] +{ +} + +PARTUPGRADE +{ + name = RFUpgrade_R-13F2-300 + partIcon = RO-H1-RS27 // FIXME Once we get dedicated model + techRequired = efficientSupersonic + entryCost = 0 + cost = 0 + title = R13 Engine Upgrade: R-13F2-300 Config + basicInfo = Engine Performance Upgrade + manufacturer = Engine Upgrade + deleteme = 1 + description = The R13 Engine now supports the R-13F2-300 configuration for increased performance. Unlock it in the VAB/SPH through the engine configs interface.\n\n +} + +PART +{ + name = RFUpgrade_engineConfigSource_R-13F2-300 + engineType = R13 +} + +@PART[RFUpgrade_engineConfigSource_R-13F2-300]:AFTER[RealismOverhaulEngines] +{ + %MODULE[Module*EngineConfigs] { + @name = ModuleEngineConfigs + %CONFIG[R-13F2-300] { + &specLevel = operational + } + } +} + +@PARTUPGRADE[RFUpgrade_R-13F2-300]:AFTER[RealismOverhaulEngines] +{ + %description = #$description$\nAvailable at specLevel $@PART[RFUpgrade_engineConfigSource_R-13F2-300]/MODULE[ModuleEngineConfigs]/CONFIG[R-13F2-300]/specLevel$ + // TODO: could add any number of other useful fields from the CONFIG here. cost? description? +} + +!PART[RFUpgrade_engineConfigSource_R-13F2-300]:AFTER[RealismOverhaulEngines] +{ +} + PARTUPGRADE { name = RFUpgrade_R-15BD-300 @@ -23629,6 +23757,166 @@ PART { } +PARTUPGRADE +{ + name = RFUpgrade_WP-13 + partIcon = RO-H1-RS27 // FIXME Once we get dedicated model + techRequired = matureTurbofans + entryCost = 0 + cost = 0 + title = R13 Engine Upgrade: WP-13 Config + basicInfo = Engine Performance Upgrade + manufacturer = Engine Upgrade + deleteme = 1 + description = The R13 Engine now supports the WP-13 configuration for increased performance. Unlock it in the VAB/SPH through the engine configs interface.\n\n +} + +PART +{ + name = RFUpgrade_engineConfigSource_WP-13 + engineType = R13 +} + +@PART[RFUpgrade_engineConfigSource_WP-13]:AFTER[RealismOverhaulEngines] +{ + %MODULE[Module*EngineConfigs] { + @name = ModuleEngineConfigs + %CONFIG[WP-13] { + &specLevel = operational + } + } +} + +@PARTUPGRADE[RFUpgrade_WP-13]:AFTER[RealismOverhaulEngines] +{ + %description = #$description$\nAvailable at specLevel $@PART[RFUpgrade_engineConfigSource_WP-13]/MODULE[ModuleEngineConfigs]/CONFIG[WP-13]/specLevel$ + // TODO: could add any number of other useful fields from the CONFIG here. cost? description? +} + +!PART[RFUpgrade_engineConfigSource_WP-13]:AFTER[RealismOverhaulEngines] +{ +} + +PARTUPGRADE +{ + name = RFUpgrade_WP-13A-II + partIcon = RO-H1-RS27 // FIXME Once we get dedicated model + techRequired = refinedTurbofans + entryCost = 0 + cost = 0 + title = R13 Engine Upgrade: WP-13A-II Config + basicInfo = Engine Performance Upgrade + manufacturer = Engine Upgrade + deleteme = 1 + description = The R13 Engine now supports the WP-13A-II configuration for increased performance. Unlock it in the VAB/SPH through the engine configs interface.\n\n +} + +PART +{ + name = RFUpgrade_engineConfigSource_WP-13A-II + engineType = R13 +} + +@PART[RFUpgrade_engineConfigSource_WP-13A-II]:AFTER[RealismOverhaulEngines] +{ + %MODULE[Module*EngineConfigs] { + @name = ModuleEngineConfigs + %CONFIG[WP-13A-II] { + &specLevel = operational + } + } +} + +@PARTUPGRADE[RFUpgrade_WP-13A-II]:AFTER[RealismOverhaulEngines] +{ + %description = #$description$\nAvailable at specLevel $@PART[RFUpgrade_engineConfigSource_WP-13A-II]/MODULE[ModuleEngineConfigs]/CONFIG[WP-13A-II]/specLevel$ + // TODO: could add any number of other useful fields from the CONFIG here. cost? description? +} + +!PART[RFUpgrade_engineConfigSource_WP-13A-II]:AFTER[RealismOverhaulEngines] +{ +} + +PARTUPGRADE +{ + name = RFUpgrade_WP-13F + partIcon = RO-H1-RS27 // FIXME Once we get dedicated model + techRequired = refinedTurbofans + entryCost = 0 + cost = 0 + title = R13 Engine Upgrade: WP-13F Config + basicInfo = Engine Performance Upgrade + manufacturer = Engine Upgrade + deleteme = 1 + description = The R13 Engine now supports the WP-13F configuration for increased performance. Unlock it in the VAB/SPH through the engine configs interface.\n\n +} + +PART +{ + name = RFUpgrade_engineConfigSource_WP-13F + engineType = R13 +} + +@PART[RFUpgrade_engineConfigSource_WP-13F]:AFTER[RealismOverhaulEngines] +{ + %MODULE[Module*EngineConfigs] { + @name = ModuleEngineConfigs + %CONFIG[WP-13F] { + &specLevel = operational + } + } +} + +@PARTUPGRADE[RFUpgrade_WP-13F]:AFTER[RealismOverhaulEngines] +{ + %description = #$description$\nAvailable at specLevel $@PART[RFUpgrade_engineConfigSource_WP-13F]/MODULE[ModuleEngineConfigs]/CONFIG[WP-13F]/specLevel$ + // TODO: could add any number of other useful fields from the CONFIG here. cost? description? +} + +!PART[RFUpgrade_engineConfigSource_WP-13F]:AFTER[RealismOverhaulEngines] +{ +} + +PARTUPGRADE +{ + name = RFUpgrade_WP-13FI + partIcon = RO-H1-RS27 // FIXME Once we get dedicated model + techRequired = refinedTurbofans + entryCost = 0 + cost = 0 + title = R13 Engine Upgrade: WP-13FI Config + basicInfo = Engine Performance Upgrade + manufacturer = Engine Upgrade + deleteme = 1 + description = The R13 Engine now supports the WP-13FI configuration for increased performance. Unlock it in the VAB/SPH through the engine configs interface.\n\n +} + +PART +{ + name = RFUpgrade_engineConfigSource_WP-13FI + engineType = R13 +} + +@PART[RFUpgrade_engineConfigSource_WP-13FI]:AFTER[RealismOverhaulEngines] +{ + %MODULE[Module*EngineConfigs] { + @name = ModuleEngineConfigs + %CONFIG[WP-13FI] { + &specLevel = operational + } + } +} + +@PARTUPGRADE[RFUpgrade_WP-13FI]:AFTER[RealismOverhaulEngines] +{ + %description = #$description$\nAvailable at specLevel $@PART[RFUpgrade_engineConfigSource_WP-13FI]/MODULE[ModuleEngineConfigs]/CONFIG[WP-13FI]/specLevel$ + // TODO: could add any number of other useful fields from the CONFIG here. cost? description? +} + +!PART[RFUpgrade_engineConfigSource_WP-13FI]:AFTER[RealismOverhaulEngines] +{ +} + PARTUPGRADE { name = RFUpgrade_WP-6 diff --git a/GameData/RP-1/Tree/TREE-Parts.cfg b/GameData/RP-1/Tree/TREE-Parts.cfg index b52451053e..62cbdfcba5 100644 --- a/GameData/RP-1/Tree/TREE-Parts.cfg +++ b/GameData/RP-1/Tree/TREE-Parts.cfg @@ -6629,6 +6629,14 @@ RP0conf = true @description ^=:$: From Advanced Jet Engines mod } +@PART[RO-R13]:FOR[xxxRP0] +{ + %TechRequired = advancedJetEngines + %cost = 436 + %entryCost = 0 + RP0conf = true + @description ^=:$: From Advanced Jet Engines mod +} @PART[RO-R15BD]:FOR[xxxRP0] { %TechRequired = advancedJetEngines diff --git a/Source/Tech Tree/Parts Browser/data/Advanced_Jet_Engines.json b/Source/Tech Tree/Parts Browser/data/Advanced_Jet_Engines.json index d634f547ed..c2af24d907 100644 --- a/Source/Tech Tree/Parts Browser/data/Advanced_Jet_Engines.json +++ b/Source/Tech Tree/Parts Browser/data/Advanced_Jet_Engines.json @@ -240,6 +240,27 @@ "identical_part_name": "", "module_tags": [] }, + { + "name": "RO-R13", + "title": "R-13 Turbojet", + "description": "", + "mod": "Advanced Jet Engines", + "cost": "436", + "entry_cost": "0", + "category": "FLIGHT", + "info": "Engine", + "year": "1968", + "technology": "advancedJetEngines", + "ro": true, + "orphan": false, + "rp0_conf": true, + "spacecraft": "", + "engine_config": "R13", + "upgrade": false, + "entry_cost_mods": "R-13-300", + "identical_part_name": "", + "module_tags": [] + }, { "name": "RO-R25F", "title": "R-25 Turbojet", @@ -249,7 +270,7 @@ "entry_cost": 0, "category": "FLIGHT", "info": "Engine", - "year": "1971", + "year": "1972", "technology": "efficientSupersonic", "era": "", "ro": true, diff --git a/Source/Tech Tree/Parts Browser/data/Engine_Config.json b/Source/Tech Tree/Parts Browser/data/Engine_Config.json index b08a08a524..2641a0a348 100644 --- a/Source/Tech Tree/Parts Browser/data/Engine_Config.json +++ b/Source/Tech Tree/Parts Browser/data/Engine_Config.json @@ -10008,7 +10008,7 @@ "spacecraft": "", "engine_config": "R11", "upgrade": false, - "entry_cost_mods": "2000,RD-9BF", + "entry_cost_mods": "2000,RD-9BF-811", "identical_part_name": "", "module_tags": [] }, @@ -10056,6 +10056,69 @@ "identical_part_name": "", "module_tags": [] }, + { + "name": "R-13-300", + "title": "R-13-300", + "description": "", + "mod": "Engine_Config", + "cost": "0", + "entry_cost": "0", + "category": "FLIGHT", + "info": "", + "year": "1968", + "technology": "advancedJetEngines", + "ro": true, + "orphan": false, + "rp0_conf": true, + "spacecraft": "", + "engine_config": "R13", + "upgrade": false, + "entry_cost_mods": "2000,R-11F2S-300", + "identical_part_name": "", + "module_tags": [] + }, + { + "name": "R-13F-300", + "title": "R-13F-300", + "description": "", + "mod": "Engine_Config", + "cost": "2", + "entry_cost": "0", + "category": "FLIGHT", + "info": "", + "year": "1970", + "technology": "efficientSupersonic", + "ro": true, + "orphan": false, + "rp0_conf": true, + "spacecraft": "", + "engine_config": "R13", + "upgrade": true, + "entry_cost_mods": "2000,R-13-300", + "identical_part_name": "", + "module_tags": [] + }, + { + "name": "R-13F2-300", + "title": "R-13F2-300", + "description": "", + "mod": "Engine_Config", + "cost": "2", + "entry_cost": "0", + "category": "FLIGHT", + "info": "", + "year": "1971", + "technology": "efficientSupersonic", + "ro": true, + "orphan": false, + "rp0_conf": true, + "spacecraft": "", + "engine_config": "R13", + "upgrade": true, + "entry_cost_mods": "2000,R-13F-300", + "identical_part_name": "", + "module_tags": [] + }, { "name": "R-15B-300", "title": "R-15B-300", @@ -10074,7 +10137,7 @@ "spacecraft": "", "engine_config": "R15", "upgrade": false, - "entry_cost_mods": "20000,RD-9BF", + "entry_cost_mods": "20000,RD-9BF-811", "identical_part_name": "", "module_tags": [] }, @@ -10131,7 +10194,7 @@ "entry_cost": 0, "category": "FLIGHT", "info": "", - "year": "1971", + "year": "1972", "technology": "efficientSupersonic", "era": "", "ro": true, @@ -10140,7 +10203,7 @@ "spacecraft": "", "engine_config": "R25", "upgrade": false, - "entry_cost_mods": "1000,R-11F2S-300", + "entry_cost_mods": "1000,R-13F-300", "identical_part_name": "", "module_tags": [] }, @@ -18434,6 +18497,90 @@ "identical_part_name": "", "module_tags": [] }, + { + "name": "WP-13", + "title": "WP-13", + "description": "", + "mod": "Engine_Config", + "cost": "-15", + "entry_cost": "0", + "category": "FLIGHT", + "info": "", + "year": "1984", + "technology": "matureTurbofans", + "ro": true, + "orphan": false, + "rp0_conf": true, + "spacecraft": "", + "engine_config": "R13", + "upgrade": true, + "entry_cost_mods": "2000,R-13-300,WP-7B", + "identical_part_name": "", + "module_tags": [] + }, + { + "name": "WP-13A-II", + "title": "WP-13A-II", + "description": "", + "mod": "Engine_Config", + "cost": "14", + "entry_cost": "0", + "category": "FLIGHT", + "info": "", + "year": "1988", + "technology": "refinedTurbofans", + "ro": true, + "orphan": false, + "rp0_conf": true, + "spacecraft": "", + "engine_config": "R13", + "upgrade": true, + "entry_cost_mods": "2000,WP-13", + "identical_part_name": "", + "module_tags": [] + }, + { + "name": "WP-13F", + "title": "WP-13F", + "description": "", + "mod": "Engine_Config", + "cost": "4", + "entry_cost": "0", + "category": "FLIGHT", + "info": "", + "year": "1989", + "technology": "refinedTurbofans", + "ro": true, + "orphan": false, + "rp0_conf": true, + "spacecraft": "", + "engine_config": "R13", + "upgrade": true, + "entry_cost_mods": "2000,WP-13A-II", + "identical_part_name": "", + "module_tags": [] + }, + { + "name": "WP-13FI", + "title": "WP-13FI", + "description": "", + "mod": "Engine_Config", + "cost": "6", + "entry_cost": "0", + "category": "FLIGHT", + "info": "", + "year": "1994", + "technology": "refinedTurbofans", + "ro": true, + "orphan": false, + "rp0_conf": true, + "spacecraft": "", + "engine_config": "R13", + "upgrade": true, + "entry_cost_mods": "2000,WP-13F", + "identical_part_name": "", + "module_tags": [] + }, { "name": "WP-6", "title": "WP-6", @@ -18661,7 +18808,7 @@ "spacecraft": "", "engine_config": "WS10", "upgrade": true, - "entry_cost_mods": "5000,WP-7B", + "entry_cost_mods": "5000,WS-10B", "identical_part_name": "", "module_tags": [] }, diff --git a/Source/Tech Tree/Parts Browser/data/Stock__RO_Addition.json b/Source/Tech Tree/Parts Browser/data/Stock__RO_Addition.json index a8a66251a3..3c151b544f 100644 --- a/Source/Tech Tree/Parts Browser/data/Stock__RO_Addition.json +++ b/Source/Tech Tree/Parts Browser/data/Stock__RO_Addition.json @@ -93,7 +93,7 @@ }, { "name": "RO-WS10", - "title": "", + "title": "WS-10 Low-Bypass Turbofan", "description": "", "mod": "Stock (RO Addition)", "cost": "750",