Merge & Deprecate XLR43 (#2513)

The XLR43-NA-1 will be moved into the NAA-75-110 config, and the XLR43-NA-3 will be moved to the LR89 config.
KSP-RO · Oct 9, 2021 · 8433b08 · 8433b08
1 parent 7fbdd2a
commit 8433b08
Show file tree

Hide file tree

Showing 7 changed files with 184 additions and 72 deletions.
diff --git a/GameData/RealismOverhaul/Engine_Configs/LR105_Config.cfg b/GameData/RealismOverhaul/Engine_Configs/LR105_Config.cfg
@@ -476,7 +476,7 @@
 		ignitionReliabilityEnd = 0.965217
 		cycleReliabilityStart = 0.826087
 		cycleReliabilityEnd = 0.965217
-		techTransfer = XLR43-NA-3:50	//LR43 was an XLR43 modified to burn kerosene.
+		techTransfer = XLR43-NA-1,A-6,A-6H,A-7:20&XLR43-NA-3:50	//LR43 was an XLR43-NA-3 modified to burn kerosene. Derived from XLR43-NA-1/NAA-75 TP
 	}
 	@MODULE[ModuleEngineConfigs] { @CONFIG[LR43-NA-5] { %ratedBurnTime = #$/TESTFLIGHT[LR43-NA-5]/ratedBurnTime$ } }
 }
@@ -496,7 +496,7 @@
 		ignitionReliabilityEnd = 0.966667
 		cycleReliabilityStart = 0.833333
 		cycleReliabilityEnd = 0.966667
-		techTransfer = XLR43-NA-3,LR43-NA-5:50
+		techTransfer = XLR43-NA-1,A-6,A-6H,A-7:20&XLR43-NA-3,LR43-NA-5:50
 	}
 	@MODULE[ModuleEngineConfigs] { @CONFIG[LR105-NA-3] { %ratedBurnTime = #$/TESTFLIGHT[LR105-NA-3]/ratedBurnTime$ } }
 }
@@ -533,7 +533,7 @@
 		ignitionReliabilityEnd = 0.991342
 		cycleReliabilityStart = 0.956710
 		cycleReliabilityEnd = 0.991342
-		techTransfer = XLR43-NA-3,LR43-NA-5,LR105-NA-3:50
+		techTransfer = XLR43-NA-1,A-6,A-6H,A-7:20&XLR43-NA-3,LR43-NA-5,LR105-NA-3:50
 	}
 	@MODULE[ModuleEngineConfigs] { @CONFIG[LR105-NA-5] { %ratedBurnTime = #$/TESTFLIGHT[LR105-NA-5]/ratedBurnTime$ } }
 }
@@ -563,7 +563,7 @@
 		ignitionReliabilityEnd = 0.987879
 		cycleReliabilityStart = 0.939394
 		cycleReliabilityEnd = 0.987879
-		techTransfer = XLR43-NA-3,LR43-NA-5,LR105-NA-3,LR105-NA-5:50
+		techTransfer = XLR43-NA-1,A-6,A-6H,A-7:20&XLR43-NA-3,LR43-NA-5,LR105-NA-3,LR105-NA-5:50
 	}
 	@MODULE[ModuleEngineConfigs] { @CONFIG[LR105-NA-6] { %ratedBurnTime = #$/TESTFLIGHT[LR105-NA-6]/ratedBurnTime$ } }
 }
@@ -581,7 +581,7 @@
 		ignitionReliabilityEnd = 0.996296
 		cycleReliabilityStart = 0.981481
 		cycleReliabilityEnd = 0.996296
-		techTransfer = XLR43-NA-3,LR43-NA-5,LR105-NA-3,LR105-NA-5,LR105-NA-6:50
+		techTransfer = XLR43-NA-1,A-6,A-6H,A-7:20&XLR43-NA-3,LR43-NA-5,LR105-NA-3,LR105-NA-5,LR105-NA-6:50
 	}
 	@MODULE[ModuleEngineConfigs] { @CONFIG[LR105-NA-7.1] { %ratedBurnTime = #$/TESTFLIGHT[LR105-NA-7.1]/ratedBurnTime$ } }
 }
@@ -599,7 +599,7 @@
 		ignitionReliabilityEnd = 0.996296
 		cycleReliabilityStart = 0.981481
 		cycleReliabilityEnd = 0.996296
-		techTransfer = XLR43-NA-3,LR43-NA-5,LR105-NA-3,LR105-NA-5,LR105-NA-6,LR105-NA-7.1:50
+		techTransfer = XLR43-NA-1,A-6,A-6H,A-7:20&XLR43-NA-3,LR43-NA-5,LR105-NA-3,LR105-NA-5,LR105-NA-6,LR105-NA-7.1:50
 	}
 	@MODULE[ModuleEngineConfigs] { @CONFIG[LR105-NA-7.2] { %ratedBurnTime = #$/TESTFLIGHT[LR105-NA-7.2]/ratedBurnTime$ } }
 }
@@ -618,7 +618,7 @@
 		ignitionReliabilityEnd = 0.998947
 		cycleReliabilityStart = 0.994737
 		cycleReliabilityEnd = 0.998947
-		techTransfer = XLR43-NA-3,LR43-NA-5,LR105-NA-5,LR105-NA-6,LR105-NA-7.1,LR105-NA-7.2,RS-27,RS-27A:50
+		techTransfer = XLR43-NA-1,A-6,A-6H,A-7:20&XLR43-NA-3,LR43-NA-5,LR105-NA-5,LR105-NA-6,LR105-NA-7.1,LR105-NA-7.2,RS-27,RS-27A:50
 	}
 	@MODULE[ModuleEngineConfigs] { @CONFIG[RS-56-OSA] { %ratedBurnTime = #$/TESTFLIGHT[RS-56-OSA]/ratedBurnTime$ } }
 }
diff --git a/GameData/RealismOverhaul/Engine_Configs/LR79_Config.cfg b/GameData/RealismOverhaul/Engine_Configs/LR79_Config.cfg
@@ -398,7 +398,7 @@
 		ignitionReliabilityEnd = 0.966667
 		cycleReliabilityStart = 0.833333
 		cycleReliabilityEnd = 0.966667
-		techTransfer = XLR43-NA-3:40	//Direct derivative of LR43
+		techTransfer = XLR43-NA-1,A-6,A-6H,A-7:20&XLR43-NA-3:50	//Direct derivative of LR43
 	}
 	@MODULE[ModuleEngineConfigs] { @CONFIG[S-3] { %ratedBurnTime = #$/TESTFLIGHT[S-3]/ratedBurnTime$ } }
 }
@@ -418,7 +418,7 @@
 		ignitionReliabilityEnd = 0.976471
 		cycleReliabilityStart = 0.882353
 		cycleReliabilityEnd = 0.976471
-		techTransfer = XLR43-NA-3,S-3:50
+		techTransfer = XLR43-NA-1,A-6,A-6H,A-7:20&XLR43-NA-3,S-3:50
 	}
 	@MODULE[ModuleEngineConfigs] { @CONFIG[S-3D] { %ratedBurnTime = #$/TESTFLIGHT[S-3D]/ratedBurnTime$ } }
 }
@@ -457,7 +457,7 @@
 		ignitionReliabilityEnd = 0.957955
 		cycleReliabilityStart = 0.789773
 		cycleReliabilityEnd = 0.957955
-		techTransfer = XLR43-NA-3,S-3,S-3D:50
+		techTransfer = XLR43-NA-1,A-6,A-6H,A-7:20&XLR43-NA-3,S-3,S-3D:50
 	}
 	@MODULE[ModuleEngineConfigs] { @CONFIG[LR79-NA-9] { %ratedBurnTime = #$/TESTFLIGHT[LR79-NA-9]/ratedBurnTime$ } }
 }
@@ -484,7 +484,7 @@
 		ignitionReliabilityEnd = 0.987273
 		cycleReliabilityStart = 0.936364
 		cycleReliabilityEnd = 0.987273
-		techTransfer = XLR43-NA-3,S-3,S-3D,LR79-NA-9:50
+		techTransfer = XLR43-NA-1,A-6,A-6H,A-7:20&XLR43-NA-3,S-3,S-3D,LR79-NA-9:50
 	}
 	@MODULE[ModuleEngineConfigs] { @CONFIG[LR79-NA-11] { %ratedBurnTime = #$/TESTFLIGHT[LR79-NA-11]/ratedBurnTime$ } }
 }
@@ -531,7 +531,7 @@
 		ignitionReliabilityEnd = 0.992929
 		cycleReliabilityStart = 0.964646
 		cycleReliabilityEnd = 0.992929
-		techTransfer = XLR43-NA-3,S-3,S-3D,LR79-NA-9,LR79-NA-11:50
+		techTransfer = XLR43-NA-1,A-6,A-6H,A-7:20&XLR43-NA-3,S-3,S-3D,LR79-NA-9,LR79-NA-11:50
 	}
 	@MODULE[ModuleEngineConfigs] { @CONFIG[LR79-NA-13] { %ratedBurnTime = #$/TESTFLIGHT[LR79-NA-13]/ratedBurnTime$ } }
 }
diff --git a/GameData/RealismOverhaul/Engine_Configs/LR87_X2_Config.cfg b/GameData/RealismOverhaul/Engine_Configs/LR87_X2_Config.cfg
@@ -430,6 +430,8 @@
 		cycleReliabilityEnd = 0.979661
 
 		clusterMultiplier = #$../clusterMultiplier$
+
+		techTransfer = XLR43-NA-3:25		//Not a direct navaho derivative, but still related
 	}
 	@MODULE[ModuleEngineConfigs] { @CONFIG[LR87-AJ-3] { %ratedBurnTime = #$/TESTFLIGHT[LR87-AJ-3]/ratedBurnTime$ } }
 }
@@ -454,7 +456,7 @@
 
 		clusterMultiplier = #$../clusterMultiplier$
 
-		techTransfer = LR87-AJ-3:30
+		techTransfer = XLR43-NA-3:25&LR87-AJ-3:30
 	}
 	@MODULE[ModuleEngineConfigs] { @CONFIG[LR87-AJ-5] { %ratedBurnTime = #$/TESTFLIGHT[LR87-AJ-5]/ratedBurnTime$ } }
 }
@@ -476,7 +478,7 @@
 
 		clusterMultiplier = #$../clusterMultiplier$
 
-		techTransfer = LR87-AJ-3,LR87-AJ-5:50
+		techTransfer = XLR43-NA-3:25&LR87-AJ-3,LR87-AJ-5:50
 	}
 	@MODULE[ModuleEngineConfigs] { @CONFIG[LR87-AJ-7] { %ratedBurnTime = #$/TESTFLIGHT[LR87-AJ-7]/ratedBurnTime$ } }
 }
@@ -500,7 +502,7 @@
 
 		clusterMultiplier = #$../clusterMultiplier$
 
-		techTransfer = LR87-AJ-3,LR87-AJ-5,LR87-AJ-7:50
+		techTransfer = XLR43-NA-3:25&LR87-AJ-3,LR87-AJ-5,LR87-AJ-7:50
 	}
 	@MODULE[ModuleEngineConfigs] { @CONFIG[LR87-AJ-9] { %ratedBurnTime = #$/TESTFLIGHT[LR87-AJ-9]/ratedBurnTime$ } }
 }
@@ -521,7 +523,7 @@
 
 		clusterMultiplier = #$../clusterMultiplier$
 
-		techTransfer = LR87-AJ-3,LR87-AJ-5,LR87-AJ-7:50
+		techTransfer = XLR43-NA-3:25&LR87-AJ-3,LR87-AJ-5,LR87-AJ-7:50
 	}
 	@MODULE[ModuleEngineConfigs] { @CONFIG[LR87-AJ-9-Kero-15AR] { %ratedBurnTime = #$/TESTFLIGHT[LR87-AJ-9-Kero-15AR]/ratedBurnTime$ } }
 }
@@ -542,7 +544,7 @@
 
 		clusterMultiplier = #$../clusterMultiplier$
 
-		techTransfer = LR87-AJ-3,LR87-AJ-5,LR87-AJ-7:50
+		techTransfer = XLR43-NA-3:25&LR87-AJ-3,LR87-AJ-5,LR87-AJ-7:50
 	}
 	@MODULE[ModuleEngineConfigs] { @CONFIG[LR87-AJ-9-Kero] { %ratedBurnTime = #$/TESTFLIGHT[LR87-AJ-9-Kero]/ratedBurnTime$ } }
 }
@@ -574,7 +576,7 @@
 
 		clusterMultiplier = #$../clusterMultiplier$
 
-		techTransfer = LR87-AJ-3,LR87-AJ-5,LR87-AJ-7,LR87-AJ-9:50
+		techTransfer = XLR43-NA-3:25&LR87-AJ-3,LR87-AJ-5,LR87-AJ-7,LR87-AJ-9:50
 	}
 	@MODULE[ModuleEngineConfigs] { @CONFIG[LR87-AJ-11] { %ratedBurnTime = #$/TESTFLIGHT[LR87-AJ-11]/ratedBurnTime$ } }
 }
@@ -602,7 +604,7 @@
 
 		clusterMultiplier = #$../clusterMultiplier$
 
-		techTransfer = LR87-AJ-3,LR87-AJ-5,LR87-AJ-7,LR87-AJ-9,LR87-AJ-11:50
+		techTransfer = XLR43-NA-3:25&LR87-AJ-3,LR87-AJ-5,LR87-AJ-7,LR87-AJ-9,LR87-AJ-11:50
 	}
 	@MODULE[ModuleEngineConfigs] { @CONFIG[LR87-AJ-11A] { %ratedBurnTime = #$/TESTFLIGHT[LR87-AJ-11A]/ratedBurnTime$ } }
 }
diff --git a/GameData/RealismOverhaul/Engine_Configs/LR89_Config.cfg b/GameData/RealismOverhaul/Engine_Configs/LR89_Config.cfg
@@ -4,6 +4,21 @@
 //	Manufacturer: Rocketdyne
 //
 //	=================================================================================
+//	XLR43-NA-3
+//	Navaho Phase IV
+//
+//	Dry Mass: 489 Kg	//Without gimbal. Use half of XLR71 mass (567 kg) to estimate gimbal mass
+//	Thrust (SL): ??? kN
+//	Thrust (Vac): 617.4 kN
+//	ISP: 230 SL / 265 Vac
+//	Burn Time: 65
+//	Chamber Pressure: ??? MPa
+//	Propellant: LOX / Ethanol90
+//	Prop Ratio: 1.375
+//	Throttle: N/A
+//	Nozzle Ratio: ???
+//	Ignitions: 1
+//	=================================================================================
 //	LR43-NA-3
 //	MA-1, or MA-0 without the sustainer
 //
@@ -160,13 +175,50 @@
 		name = ModuleEngineConfigs
 		type = ModuleEngines
 		modded = False
-		configuration = LR43-NA-3
+		configuration = XLR43-NA-3
 		origMass = 0.72
 		literalZeroIgnitions = True
 		CONFIG
+		{
+			name = XLR43-NA-3
+			description = Uprated XLR43 for later Navaho applications. First US engine to use tubular wall, aka spaghetti, thrust chamber which greatly reduced weight. Also first to use a gas generator, removing the need for HTP to power the turbopump.
+			minThrust = 617.4
+			maxThrust = 617.4
+			massMult = 0.79
+			ullage = True
+			pressureFed = False
+			ignitions = 0
+
+			IGNITOR_RESOURCE
+			{
+				name = ElectricCharge
+				amount = 0.5
+			}
+
+			PROPELLANT
+			{
+				name = Ethanol90
+				ratio = 0.4945
+				DrawGauge = True
+			}
+
+			PROPELLANT
+			{
+				name = LqdOxygen
+				ratio = 0.5055
+				DrawGauge = False
+			}
+
+			atmosphereCurve
+			{
+				key = 0 265
+				key = 1 230
+			}
+		}
+		CONFIG
 		{
 			name = LR43-NA-3
-			description = MA-0 and prototype MA-1 Atlas Booster engine. An XLR43 modified to burn kerosene. Used on Convair X12 and Atlas A
+			description = MA-0 and prototype MA-1 Atlas Booster engine, converted to burn kerosene. Used on Convair X12 and Atlas A
 			minThrust = 756.8
 			maxThrust = 756.8
 			heatProduction = 100
@@ -487,6 +539,25 @@
 }
 //Unfortunatly most sources do not differeciate Atlas booster from Atlas Sustainer (listing both as "first stage")
 //Since the sources that do differenciate between booster and sustainer show all 1st stage engines have a similar failure rate, the LR89s and LR105s use the same dataset
+//Navaho G-26 Booster: 11 flights, 6 failures (3 engine failures, incl one double failure)
+//22 engines flown, 4 failed
+@PART[*]:HAS[@MODULE[ModuleEngineConfigs]:HAS[@CONFIG[XLR43-NA-3]],!MODULE[TestFlightInterop]]:BEFORE[zTestFlight]
+{
+	TESTFLIGHT
+	{
+		name = XLR43-NA-3
+		testedBurnTime = 200		//switched to spaghetti tube design, can probably safely make longer burns
+		ratedBurnTime = 65
+		safeOverburn = true
+		ignitionReliabilityStart = 0.666667		//Very troublesome to start, < 3 attempts required for most launches
+		ignitionReliabilityEnd = 0.933333
+		cycleReliabilityStart = 0.818182
+		cycleReliabilityEnd = 0.963636
+		techTransfer = XLR43-NA-1,A-6,A-6H,A-7:20
+	}
+	@MODULE[ModuleEngineConfigs] { @CONFIG[XLR43-NA-3] { %ratedBurnTime = #$/TESTFLIGHT[XLR43-NA-3]/ratedBurnTime$ } }
+}
+
 //XSM-65A: 8 flights, 5 failures (No sustainer)
 //XSM-65B: 9 flights, 3 failures
 //Atlas-B: 1 flight, 0 failures
@@ -503,7 +574,7 @@
 		ignitionReliabilityEnd = 0.965217
 		cycleReliabilityStart = 0.826087
 		cycleReliabilityEnd = 0.965217
-		techTransfer = XLR43-NA-3:50	//LR43 was an XLR43 modified to burn kerosene.
+		techTransfer = XLR43-NA-1,A-6,A-6H,A-7:20&XLR43-NA-3:50	//LR43 was an XLR43 modified to burn kerosene.
 	}
 	@MODULE[ModuleEngineConfigs] { @CONFIG[LR43-NA-3] { %ratedBurnTime = #$/TESTFLIGHT[LR43-NA-3]/ratedBurnTime$ } }
 }
@@ -522,7 +593,7 @@
 		ignitionReliabilityEnd = 0.966667
 		cycleReliabilityStart = 0.833333
 		cycleReliabilityEnd = 0.966667
-		techTransfer = XLR43-NA-3,LR43-NA-3:50
+		techTransfer = XLR43-NA-1,A-6,A-6H,A-7:20&XLR43-NA-3,LR43-NA-3:50
 	}
 	@MODULE[ModuleEngineConfigs] { @CONFIG[LR89-NA-3] { %ratedBurnTime = #$/TESTFLIGHT[LR89-NA-3]/ratedBurnTime$ } }
 }
@@ -561,7 +632,7 @@
 		ignitionReliabilityEnd = 0.991342
 		cycleReliabilityStart = 0.956710
 		cycleReliabilityEnd = 0.991342
-		techTransfer = XLR43-NA-3,LR43-NA-3,LR89-NA-3:50
+		techTransfer = XLR43-NA-1,A-6,A-6H,A-7:20&XLR43-NA-3,LR43-NA-3,LR89-NA-3:50
 	}
 	@MODULE[ModuleEngineConfigs] { @CONFIG[LR89-NA-5] { %ratedBurnTime = #$/TESTFLIGHT[LR89-NA-5]/ratedBurnTime$ } }
 }
@@ -593,7 +664,7 @@
 		ignitionReliabilityEnd = 0.987879
 		cycleReliabilityStart = 0.939394
 		cycleReliabilityEnd = 0.987879
-		techTransfer = XLR43-NA-3,LR43-NA-3,LR89-NA-3,LR89-NA-5:50
+		techTransfer = XLR43-NA-1,A-6,A-6H,A-7:20&XLR43-NA-3,LR43-NA-3,LR89-NA-3,LR89-NA-5:50
 	}
 	@MODULE[ModuleEngineConfigs] { @CONFIG[LR89-NA-6] { %ratedBurnTime = #$/TESTFLIGHT[LR89-NA-6]/ratedBurnTime$ } }
 }
@@ -613,7 +684,7 @@
 		ignitionReliabilityEnd = 0.996296
 		cycleReliabilityStart = 0.981481
 		cycleReliabilityEnd = 0.996296
-		techTransfer = XLR43-NA-3,LR43-NA-3,LR89-NA-3,LR89-NA-5,LR89-NA-6:50
+		techTransfer = XLR43-NA-1,A-6,A-6H,A-7:20&XLR43-NA-3,LR43-NA-3,LR89-NA-3,LR89-NA-5,LR89-NA-6:50
 	}
 	@MODULE[ModuleEngineConfigs] { @CONFIG[LR89-NA-7.1] { %ratedBurnTime = #$/TESTFLIGHT[LR89-NA-7.1]/ratedBurnTime$ } }
 }
@@ -633,7 +704,7 @@
 		ignitionReliabilityEnd = 0.996296
 		cycleReliabilityStart = 0.981481
 		cycleReliabilityEnd = 0.996296
-		techTransfer = XLR43-NA-3,LR43-NA-3,LR89-NA-3,LR89-NA-5,LR89-NA-6,LR89-NA-7.1:50
+		techTransfer = XLR43-NA-1,A-6,A-6H,A-7:20&XLR43-NA-3,LR43-NA-3,LR89-NA-3,LR89-NA-5,LR89-NA-6,LR89-NA-7.1:50
 	}
 	@MODULE[ModuleEngineConfigs] { @CONFIG[LR89-NA-7.2] { %ratedBurnTime = #$/TESTFLIGHT[LR89-NA-7.2]/ratedBurnTime$ } }
 }
@@ -654,7 +725,7 @@
 		ignitionReliabilityEnd = 0.998947
 		cycleReliabilityStart = 0.994737
 		cycleReliabilityEnd = 0.998947
-		techTransfer = XLR43-NA-3,LR43-NA-3,LR89-NA-7.1,LR89-NA-7.2,RS-27,RS-27A:50
+		techTransfer = XLR43-NA-1,A-6,A-6H,A-7:20&XLR43-NA-3,LR43-NA-3,LR89-NA-7.1,LR89-NA-7.2,RS-27,RS-27A:50
 	}
 	@MODULE[ModuleEngineConfigs] { @CONFIG[RS-56-OBA] { %ratedBurnTime = #$/TESTFLIGHT[RS-56-OBA]/ratedBurnTime$ } }
 }