NFA liftjets and R79 (#2340)

KSP-RO · Mar 20, 2024 · b65ce48 · b65ce48
1 parent 58781d5
commit b65ce48
Show file tree

Hide file tree

Showing 7 changed files with 480 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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
@@ -7042,6 +7042,14 @@
     %MODULE[ModuleTagList] { tag = Instruments }
 
 }
+@PART[RO-SXT-R79]:FOR[xxxRP0]
+{
+    %TechRequired = refinedTurbofans
+    %cost = 743
+    %entryCost = 0
+    RP0conf = true
+    @description ^=:$: <b><color=green>From SXT (RO Addition) mod</color></b>
+}
 @PART[RO-Sapphire203]:FOR[xxxRP0]
 {
     %TechRequired = supersonicFlightRP0
@@ -7219,6 +7227,14 @@
     RP0conf = true
     @description ^=:$: <b><color=green>From Advanced Jet Engines mod</color></b>
 }
+@PART[RO-nfa-RD41]:FOR[xxxRP0]
+{
+    %TechRequired = refinedTurbofans
+    %cost = 456
+    %entryCost = 0
+    RP0conf = true
+    @description ^=:$: <b><color=green>From Near Future Aeronautics mod</color></b>
+}
 @PART[RO-nflv-rcs-aero-heavy-1-half]:FOR[xxxRP0]
 {
     %TechRequired = unlockParts
@@ -25458,6 +25474,22 @@
     RP0conf = true
     @description ^=:$: <b><color=green>From Near Future Aeronautics mod</color></b>
 }
+@PART[nfa-vtol-0625-1]:FOR[xxxRP0]
+{
+    %TechRequired = advancedJetEngines
+    %cost = 161
+    %entryCost = 0
+    RP0conf = true
+    @description ^=:$: <b><color=green>From Near Future Aeronautics mod</color></b>
+}
+@PART[nfa-vtol-125-1]:FOR[xxxRP0]
+{
+    %TechRequired = advancedJetEngines
+    %cost = 322
+    %entryCost = 0
+    RP0conf = true
+    @description ^=:$: <b><color=green>From Near Future Aeronautics mod</color></b>
+}
 @PART[nfex-antenna-deploy-wv3-1]:FOR[xxxRP0]
 {
     %TechRequired = interplanetaryComms