From f331b301e7b39902c19cad60336db06bed77bf85 Mon Sep 17 00:00:00 2001 From: Capkirk123 Date: Sat, 27 May 2023 17:32:06 -0600 Subject: [PATCH] Add configs for R-9 engines (#1933) Add configs for RD-0106 and RD-111 --- GameData/RP-0/Tree/ECM-Engines.cfg | 3 + GameData/RP-0/Tree/ECM-Parts.cfg | 1 + GameData/RP-0/Tree/TREE-Engines.cfg | 100 ++++++++++++++++++ GameData/RP-0/Tree/TREE-Parts.cfg | 11 ++ .../Parts Browser/data/Engine_Config.json | 63 +++++++++++ .../Parts Browser/data/ROEngines.json | 23 ++++ 6 files changed, 201 insertions(+) diff --git a/GameData/RP-0/Tree/ECM-Engines.cfg b/GameData/RP-0/Tree/ECM-Engines.cfg index 46bf77e4750..254abe7c2d6 100644 --- a/GameData/RP-0/Tree/ECM-Engines.cfg +++ b/GameData/RP-0/Tree/ECM-Engines.cfg @@ -453,6 +453,7 @@ R-42DM-NTO = 0 R-4D-11 = 0 RD-0105 = R7-Uppers + RD-0106 = 2000,RD-0107 RD-0107 = R7-Vacuum, 5000 RD-0109 = 2000, RD-0105 RD-0110 = 2000, RD-0107 @@ -522,6 +523,8 @@ RD-108-8D77 = 2000, R7-TP-1958, RD-108-8D75-1958 RD-108A-14D21 = 2000, R7-TP-1998, RD-108-11D512P RD-109-8D711 = 60000, HydrazineFuel + RD-111-8D716 = 10000,RD-108-8D75-1959 + RD-111-8D716A = 3000,RD-111-8D716 RD-119-8D710 = 10000,RD-109-8D711 RD-120 = 0,StagedKerolox RD-120F = 0,RD-120 diff --git a/GameData/RP-0/Tree/ECM-Parts.cfg b/GameData/RP-0/Tree/ECM-Parts.cfg index f6a3186fb74..5f40f82e4d5 100644 --- a/GameData/RP-0/Tree/ECM-Parts.cfg +++ b/GameData/RP-0/Tree/ECM-Parts.cfg @@ -1002,6 +1002,7 @@ ROE-RD108 = RD-108-8D75 ROE-RD108-SSTU = RD-108-8D75 ROE-RD109 = RD-109-8D711 + ROE-RD111 = RD-111-8D716 ROE-RD120 = RD-120 ROE-RD170 = RD-170 ROE-RD170-SSTU = RD-170 diff --git a/GameData/RP-0/Tree/TREE-Engines.cfg b/GameData/RP-0/Tree/TREE-Engines.cfg index 4759e850991..e7e4e1c7d22 100644 --- a/GameData/RP-0/Tree/TREE-Engines.cfg +++ b/GameData/RP-0/Tree/TREE-Engines.cfg @@ -2928,6 +2928,13 @@ %cost = 0 } + @CONFIG[RD-0106] + { + %techRequired = orbitalRocketry1961 + %cost = -25 + *@PARTUPGRADE[RFUpgrade_RD-0106]/deleteme -= 1 + } + @CONFIG[RD-0107] { %techRequired = orbitalRocketry1960 @@ -3403,6 +3410,19 @@ %cost = 0 } + @CONFIG[RD-111-8D716] + { + %techRequired = orbitalRocketry1961 + %cost = 0 + } + + @CONFIG[RD-111-8D716A] + { + %techRequired = orbitalRocketry1963 + %cost = 10 + *@PARTUPGRADE[RFUpgrade_RD-111-8D716A]/deleteme -= 1 + } + @CONFIG[RD-119-8D710] { %techRequired = orbitalRocketry1961 @@ -14523,6 +14543,46 @@ PART { } +PARTUPGRADE +{ + name = RFUpgrade_RD-0106 + partIcon = RO-H1-RS27 // FIXME Once we get dedicated model + techRequired = orbitalRocketry1961 + entryCost = 0 + cost = 0 + title = RD0110 Engine Upgrade: RD-0106 Config + basicInfo = Engine Performance Upgrade + manufacturer = Engine Upgrade + deleteme = 1 + description = The RD0110 Engine now supports the RD-0106 configuration for increased performance. Unlock it in the VAB/SPH through the engine configs interface.\n\n +} + +PART +{ + name = RFUpgrade_engineConfigSource_RD-0106 + engineType = RD0110 +} + +@PART[RFUpgrade_engineConfigSource_RD-0106]:AFTER[RealismOverhaulEngines] +{ + %MODULE[Module*EngineConfigs] { + @name = ModuleEngineConfigs + %CONFIG[RD-0106] { + &specLevel = operational + } + } +} + +@PARTUPGRADE[RFUpgrade_RD-0106]:AFTER[RealismOverhaulEngines] +{ + %description = #$description$\nAvailable at specLevel $@PART[RFUpgrade_engineConfigSource_RD-0106]/MODULE[ModuleEngineConfigs]/CONFIG[RD-0106]/specLevel$ + // TODO: could add any number of other useful fields from the CONFIG here. cost? description? +} + +!PART[RFUpgrade_engineConfigSource_RD-0106]:AFTER[RealismOverhaulEngines] +{ +} + PARTUPGRADE { name = RFUpgrade_RD-0109 @@ -16163,6 +16223,46 @@ PART { } +PARTUPGRADE +{ + name = RFUpgrade_RD-111-8D716A + partIcon = RO-H1-RS27 // FIXME Once we get dedicated model + techRequired = orbitalRocketry1963 + entryCost = 0 + cost = 0 + title = RD111 Engine Upgrade: RD-111-8D716A Config + basicInfo = Engine Performance Upgrade + manufacturer = Engine Upgrade + deleteme = 1 + description = The RD111 Engine now supports the RD-111-8D716A configuration for increased performance. Unlock it in the VAB/SPH through the engine configs interface.\n\n +} + +PART +{ + name = RFUpgrade_engineConfigSource_RD-111-8D716A + engineType = RD111 +} + +@PART[RFUpgrade_engineConfigSource_RD-111-8D716A]:AFTER[RealismOverhaulEngines] +{ + %MODULE[Module*EngineConfigs] { + @name = ModuleEngineConfigs + %CONFIG[RD-111-8D716A] { + &specLevel = operational + } + } +} + +@PARTUPGRADE[RFUpgrade_RD-111-8D716A]:AFTER[RealismOverhaulEngines] +{ + %description = #$description$\nAvailable at specLevel $@PART[RFUpgrade_engineConfigSource_RD-111-8D716A]/MODULE[ModuleEngineConfigs]/CONFIG[RD-111-8D716A]/specLevel$ + // TODO: could add any number of other useful fields from the CONFIG here. cost? description? +} + +!PART[RFUpgrade_engineConfigSource_RD-111-8D716A]:AFTER[RealismOverhaulEngines] +{ +} + PARTUPGRADE { name = RFUpgrade_RD-119-8D710 diff --git a/GameData/RP-0/Tree/TREE-Parts.cfg b/GameData/RP-0/Tree/TREE-Parts.cfg index 806709dfca6..72f3a9bd07c 100644 --- a/GameData/RP-0/Tree/TREE-Parts.cfg +++ b/GameData/RP-0/Tree/TREE-Parts.cfg @@ -15213,6 +15213,17 @@ %MODULE[ModuleTagList] { tag = EngineLiquidTurbo } %MODULE[ModuleTagList] { tag = Toxic } +} +@PART[ROE-RD111]:FOR[xxxRP0] +{ + %TechRequired = orbitalRocketry1961 + %cost = 590 + %entryCost = 0 + RP0conf = true + @description ^=:$: From ROEngines mod + + %MODULE[ModuleTagList] { tag = EngineLiquidTurbo } + } @PART[ROE-RD120]:FOR[xxxRP0] { diff --git a/Source/Tech Tree/Parts Browser/data/Engine_Config.json b/Source/Tech Tree/Parts Browser/data/Engine_Config.json index 10b543b1b06..cfa09cfc13d 100644 --- a/Source/Tech Tree/Parts Browser/data/Engine_Config.json +++ b/Source/Tech Tree/Parts Browser/data/Engine_Config.json @@ -9792,6 +9792,27 @@ "identical_part_name": "", "module_tags": [] }, + { + "name": "RD-0106", + "title": "RD-0106", + "description": "", + "mod": "Engine_Config", + "cost": -25, + "entry_cost": "0", + "category": "ORBITAL", + "info": "", + "year": "1961", + "technology": "orbitalRocketry1961", + "ro": true, + "orphan": false, + "rp0_conf": true, + "spacecraft": "R-9", + "engine_config": "RD0110", + "upgrade": true, + "entry_cost_mods": "2000,RD-0107", + "identical_part_name": "", + "module_tags": [] + }, { "name": "RD-0107", "title": "RD-0107", @@ -11322,6 +11343,48 @@ "Toxic" ] }, + { + "name": "RD-111-8D716", + "title": "RD-111-8D716", + "description": "", + "mod": "Engine_Config", + "cost": "0", + "entry_cost": "0", + "category": "ORBITAL", + "info": "", + "year": "1961", + "technology": "orbitalRocketry1961", + "ro": true, + "orphan": false, + "rp0_conf": true, + "spacecraft": "R-9", + "engine_config": "RD111", + "upgrade": false, + "entry_cost_mods": "10000,RD-108-8D75-1959", + "identical_part_name": "", + "module_tags": [] + }, + { + "name": "RD-111-8D716A", + "title": "RD-111-8D716A", + "description": "", + "mod": "Engine_Config", + "cost": 10, + "entry_cost": "0", + "category": "ORBITAL", + "info": "", + "year": "1963", + "technology": "orbitalRocketry1963", + "ro": true, + "orphan": false, + "rp0_conf": true, + "spacecraft": "", + "engine_config": "RD111", + "upgrade": true, + "entry_cost_mods": "3000,RD-111-8D716", + "identical_part_name": "", + "module_tags": [] + }, { "name": "RD-119-8D710", "title": "RD-119-8D710", diff --git a/Source/Tech Tree/Parts Browser/data/ROEngines.json b/Source/Tech Tree/Parts Browser/data/ROEngines.json index e5e86a04079..3a6afdc2a63 100644 --- a/Source/Tech Tree/Parts Browser/data/ROEngines.json +++ b/Source/Tech Tree/Parts Browser/data/ROEngines.json @@ -5281,6 +5281,29 @@ "Toxic" ] }, + { + "name": "ROE-RD111", + "title": "RD-111", + "description": "", + "mod": "ROEngines", + "cost": "590", + "entry_cost": "0", + "category": "ORBITAL", + "info": "Engine", + "year": "1961", + "technology": "orbitalRocketry1961", + "ro": true, + "orphan": false, + "rp0_conf": true, + "spacecraft": "R-9", + "engine_config": "RD111", + "upgrade": false, + "entry_cost_mods": "RD-111-8D716", + "identical_part_name": "", + "module_tags": [ + "EngineLiquidTurbo" + ] + }, { "name": "ROE-RD120", "title": "RD-120",