Adjust solid, Navaho ECMs (#1552)

* Adjust solids, Navaho, RD107/108 ECMs

* Fix RD-108, LR89 ECMs

* tag KDU414

* Adjust phase III costs

GameData/RP-0/Tree/ECM-Engines.cfg

@@ -182,8 +182,8 @@
     LR129-P-1 = 5000,XLR129-P-1
     LR129-P-2 = 100000,LR129-P-1
     LR129-P-3 = 0,LR129-P-2
-    LR43-NA-3 = 12000, Navaho-TP
-    LR43-NA-5 = 15000, Navaho-TP
+    LR43-NA-3 = 12000, Navaho-TP, XLR43-NA-3
+    LR43-NA-5 = 20000, Navaho-TP
     LR79-NA-11 = 2000, Navaho-TP-1960, LR79-NA-9
     LR79-NA-13 = 2000, Navaho-TP-1962, LR79-NA-11
     LR79-NA-9 = 2000, Navaho-TP-1959, S-3D
@@ -319,12 +319,12 @@
     RD-107A-14D22 = 2000, R7-TP-1998, RD-107-11D511P
     RD-108-11D512 = 2000, R7-TP-1972, RD-108-8D727
     RD-108-11D512P = 2000, R7-TP-1981, RD-108-11D512
-    RD-108-8475PS = 2000, R7-TP-1957, RD-108-8D75
     RD-108-8D727 = 2000, R7-TP-1965, RD-108-8D75K
     RD-108-8D75 = 10000, R7-TP
-    RD-108-8D75-1958 = 2000, R7-TP-1958, RD-108-8475PS
+    RD-108-8D75-1958 = 2000, R7-TP-1958, RD-108-8D75PS
     RD-108-8D75-1959 = 2000, R7-TP-1960, RD-108-8D77
     RD-108-8D75K = 2000, R7-TP-1960, RD-108-8D75-1959
+    RD-108-8D75PS = 2000, R7-TP-1957, RD-108-8D75
     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
@@ -429,7 +429,7 @@
     Rutherford-SL = 15000, ElectricPumps
     RutherfordVac = 5000, Rutherford-SL
     S-155 = 10000, Wasserfall
-    S-3 = 10000, Navaho-TP
+    S-3 = 23000, Navaho-TP
     S-3D = 2000, Navaho-TP-1958, S-3
     S-II-Ullage = 0
     S1-5400 = RD58-Family
@@ -447,29 +447,29 @@
     STAR-17 = 15000,STARCTPB
     STAR-37 = 5000, Altair-III, SolidsPBAN
     STAR-37E = 5000, STAR-37
-    STAR-37FM = 5000, STAR-37E, STARComposite
+    STAR-37FM = 5000, STAR-37E, STAR
     STBE-1A = 190000
     STBE-1B = 10000,STBE-1A
     STBE-3 = 50000,STBE-1A
     STME = 200000,RS-25A
     Star-13B = 10000,STARCTPB
-    Star-15G = 10000,STARComposite
+    Star-15G = 10000,STAR
     Star-17A = 10000,STAR-17
     Star-20 = Altair-III
-    Star-27 = 10000,STARComposite
-    Star-3 = 2000,STARComposite
-    Star-30BP = 10000,STARComposite
+    Star-27 = 10000,STAR
+    Star-3 = 2000,STARCTPB
+    Star-30BP = 10000,STAR
     Star-31 = 15000, Antares-II, SolidsHTPB
     Star-48B/Long = 7000,Star-48B/Short
-    Star-48B/Short = 15000,STARComposite
+    Star-48B/Short = 15000,STAR
     Star-4G = 10000,Star-5D
     Star-5C = 6000,STARCTPB
     Star-5D = 8000,Star-5C
-    Star-63D = 20000,STARComposite
-    Star-6B = 5000,STARComposite
-    Star-8 = 6000,STARComposite
-    Star-9 = 6000,STARComposite
-    Star48BV = 20000,STARComposite,SolidsTVC
+    Star-63D = 20000,STAR
+    Star-6B = 5000,STARCTPB
+    Star-8 = 6000,STARCTPB
+    Star-9 = 6000,STAR
+    Star48BV = 20000,STAR,SolidsTVC
     Stentor = 5000, GammaTP
     SuperDraco = 0
     T17-E2 = 3000, SolidsHollow, XM-20
@@ -524,8 +524,8 @@
     XLR25-CW-1 = XLR11-RM-5, 5000
     XLR35-RM-1 = 8000,XLR11-RM-5
     XLR41 = Navaho-PhaseII-TP
-    XLR43-NA-1 = 10000, Navaho-PhaseIII-TP
-    XLR43-NA-3 = Navaho-TP
+    XLR43-NA-1 = 5000, Navaho-PhaseIII-TP
+    XLR43-NA-3 = 5000,Navaho-PhaseIV-TP
     XLR81-BA-11 = Model8096
     XLR81-BA-13 = 30000, Model8096
     XLR81-BA-3 = Model8001

GameData/RP-0/Tree/ECM-Parts.cfg

@@ -112,7 +112,7 @@
     FASALM-LandingLegsSA = legsImproved
     FASALM-OutputPlace = legsImproved
     FASAMercuryAtlasEng = LR43-NA-3
-    FASAMercuryAtlasEngBooster = LR43-NA-3
+    FASAMercuryAtlasEngBooster = XLR43-NA-3
     FASAMercuryAtlasVernierEngine = LR101-NA-3
     FASAMercuryPod = capsulesMercury
     FASAMercuryPodRCS = 1000, rcsMult
@@ -123,7 +123,7 @@
     FASA-Gemini-Lander-Leg-Part = legsImproved
     FASA-Gemini-Lander-Legs = legsEarly
     FASA-Gemini-RCS-Thrusters = 1000, rcsMulti
-    FASA-Mercury-Redstone-Eng = A-6
+    FASA-Mercury-Redstone-Eng = XLR43-NA-1
     FASA-RO-UA1207 = UA1207
     FASAlaunchClamp125 = 1
     FASAlaunchClamp25 = 1
@@ -427,7 +427,7 @@
     RO-Kestrel = Kestrel
     RO-LMAE = LMAE
     RO-LMDE = LMDE-H
-    RO-LR-89 = LR43-NA-3
+    RO-LR-89 = XLR43-NA-3
     RO-LR105 = LR43-NA-3
     RO-LR79 = S-3
     RO-M55 = M55
@@ -454,7 +454,7 @@
     RO-RPWS = 2500,RO-SWPlasmaAnalyzer
     RO-RSRM = RSRM-1981
     RO-RangerRetro = RangerRetro
-    RO-RealEngines-A-7 = A-6
+    RO-RealEngines-A-7 = XLR43-NA-1
     RO-RealEngines-AJ10-104 = AJ10-104
     RO-RealEngines-AJ10-137 = AJ10-137
     RO-RealEngines-AJ10-190 = AJ10-190
@@ -653,8 +653,8 @@
     ROE-25KS18000-RN = 2-5KS18000
     ROE-A4 = A-4
     ROE-A4-RE = A-4
-    ROE-A7 = A-6
-    ROE-A7-RE = A-6
+    ROE-A7 = XLR43-NA-1
+    ROE-A7-RE = XLR43-NA-1
     ROE-AJ10-137 = AJ10-137
     ROE-AJ10-137-SSTU = AJ10-137
     ROE-AJ10-190 = AJ10-190
@@ -761,8 +761,8 @@
     ROE-LR87-LH2 = LR87-LH2-TitanC
     ROE-LR87-LH2V = LR87-LH2-Vacuum
     ROE-LR87-Single = LR87-AJ-3
-    ROE-LR89 = LR43-NA-3
-    ROE-LR89-BDB = LR43-NA-3
+    ROE-LR89 = XLR43-NA-3
+    ROE-LR89-BDB = XLR43-NA-3
     ROE-LR91 = LR91-AJ-3
     ROE-LR91-RN = LR91-AJ-3
     ROE-LargeApolloLC = 1
@@ -1253,7 +1253,7 @@
     bluedog-Atlas-LR101-Inline = LR101-NA-3
     bluedog-Atlas-LR101-Radial = LR101-NA-3
     bluedog-Atlas-LR105 = LR43-NA-3
-    bluedog-Atlas-LR89 = LR43-NA-3
+    bluedog-Atlas-LR89 = XLR43-NA-3
     bluedog-CXA-APAS-A-L04F = APAS8995Dock
     bluedog-CXA-APAS-P = APAS8995Dock
     bluedog-Castor120 = Castor-120
@@ -1295,7 +1295,7 @@
     bluedog-agenaProbeCore = 2000, avionicsUpperBasic, avionicsHibernation
     bluedog-alcyone = Alcyone
     bluedog-castorSRB = XM-20
-    bluedog-redstone = A-6
+    bluedog-redstone = XLR43-NA-1
     bluedog-star20 = Star-20
     bluedog-star31 = Star-31
     bluedog-star37 = STAR-37FM

GameData/RP-0/Tree/EntryCostModifiers.cfg

@@ -31,16 +31,17 @@ ENTRYCOSTMODS
 	PumpReignition = 20000 // Ability to Relight
 	Gimbal = 0 // Given it's standard in turbopump engines, I think this can be applied only for PF ones
 
+	//Solids
 	SolidsHollow = 5000 // WW2 US tech
 	SolidsComposite = 5000 // PSPC - composite propellant, rubberized.
 	SolidsFiber = 20000 // Starting with Altair: fiberglass casing
 	SolidsAluminum = 50000, SolidsComposite, SolidsHollow // addition of Aluminum
 	SolidsTVC = 100000 // Gas injection, jet vanes, whatever.
-	SolidsPBAA = 15000, SolidsFiber, SolidsAluminum
-	SolidsPUPE = 5000, SolidsFiber, SolidsAluminum
-	SolidsCTPB = 10000, SolidsFiber, SolidsAluminum
-	SolidsPBAN = 50000, SolidsPBAA
-	SolidsHTPB = 50000, SolidsCTPB
+	SolidsPBAA = 15000, SolidsFiber, SolidsAluminum //Polybutadiene Acrylic Acid
+	SolidsPUPE = 5000, SolidsFiber, SolidsAluminum //???
+	SolidsCTPB = 10000, SolidsFiber, SolidsAluminum //Carboxy-Terminated Polybutadiene (Thiokol TP-H-3062, TP-H-3237A)
+	SolidsPBAN = 50000, SolidsPBAA //Polybutadiene Acrylonitrile
+	SolidsHTPB = 50000, SolidsCTPB //Hydroxy-Terminated Polybutadiene (Thiokol TP-H-1202, TP-H-3340)
 	SolidsLarge = 100000, SolidsFiber, SolidsHollow
 	SolidsSegmented = 50000, SolidsLarge
 	Minuteman = 30000, SolidsPBAA
@@ -49,16 +50,18 @@ ENTRYCOSTMODS
 	GEM = 20000, SolidsHTPB
 	STARCTPB = 10000, SolidsCTPB
 	STAR = 15000, SolidsHTPB, STARCTPB
-	STARComposite = 10000, STAR
+	//STARComposite = 10000, STAR	//Composite casings were commonplace by the time the STAR series began, unessecary
 	Castor-1 = 800, XM-20
 	Castor-2 = 8000, Castor-1, SolidsPBAA
 
 
 	// Rocketdyne
-	Navaho-PhaseII-TP = 10000
-	Navaho-PhaseIII-TP = 20000, Navaho-PhaseII-TP
+	Navaho-PhaseI-TP = 1 //Testing of captured A-4s (~1946)
+	Navaho-PhaseII-TP = 10000, Navaho-PhaseI-TP //Construction of XLR-41 (~1947)
+	Navaho-PhaseIII-TP = 25000, Navaho-PhaseII-TP //Development of unified injector head. Construction of XLR43-NA-1/NAA-75-110. (1950)
+	Navaho-PhaseIV-TP = 40000, Navaho-PhaseIII-TP //Development of self-powered TP, spaghetti tube construction. Construction of XLR41-NA-3, XLR-71-NA-1
 
-	Navaho-TP = 80000, Navaho-PhaseIII-TP
+	Navaho-TP = 40000, Navaho-PhaseIV-TP //Navaho phase VI. Converting Navaho IV and V pumps to kerosene. Basis of all american TP engines
 	Navaho-TP-1958 = 10000, Navaho-TP
 	Navaho-TP-1959 = 10000, Navaho-TP-1958
 	Navaho-TP-1960 = 10000, Navaho-TP-1959
@@ -79,7 +82,7 @@ ENTRYCOSTMODS
 	rcsMulti = rcsMult
 
 	// Aerojet
-	AJTitan = 80000, Navaho-PhaseIII-TP
+	AJTitan = 40000, Navaho-PhaseIV-TP
 	AJTitan-5 = 15000, HypergolicPumps, AerozineFuel
 	AJTitan-7 = 15000, AJTitan-5
 	AJTitan-9 = 20000, AJTitan-7
@@ -89,7 +92,7 @@ ENTRYCOSTMODS
 	AJTitan-LH2-Upgrade = 40000, LR87-LH2-Vacuum
 
 	// Bell
-	Model117ECM = 12000, Navaho-PhaseIII-TP, HypergolicPumps
+	Model117ECM = 12000, Navaho-PhaseIV-TP, HypergolicPumps
 	Model8001 = 5000, Model117ECM //Identical to Model117 except for added gimbal
 	Model8048 = 5000, Model8001 // Expensive because it switched to Hypergolic
 	Model8081 = 10000, Model8048 // Double the burn time
@@ -98,20 +101,20 @@ ENTRYCOSTMODS
 
 	// *** Russian
 	RD102-TP = 3000
-	RD103-TP = 25000, RD102-TP
+	RD103-TP = 25000, RD102-TP //Upper limit of direct A-4 derivatives
 
 	//Early Glushko
-	RD200-TP = 5000, RD102-TP, Wasserfall
+	RD200-TP = 5000, RD102-TP, Wasserfall //Switch to multichamber based on Wasserfall after failure of scaled up A-4 derivatives (RD-105/106)
 
 	//R-12/Buran Family
-	R12-TP = 10000, RD200-TP
+	R12-TP = 10000, RD200-TP //Slight upgrades of RD200 by Glushko allowed hypergolic IRBMs
 	R12-TP-1956 = 5000, R12-TP
 	R12-TP-1957 = 5000, R12-TP-1956
 	R12-TP-1959 = 5000, R12-TP-1957
 	R12-TP-1960 = 5000, R12-TP-1959
 
 	//R-14/R-16/R-36 Family
-	R14-TP = 100000, HypergolicPumps, R12-TP-1959
+	R14-TP = 100000, HypergolicPumps, R12-TP-1959 //Continued upgrades allowed hypergolic ICBMs
 	R14-TP-1960 = 20000, R14-TP
 	R14-TP-1968 = 5000, R14-TP-1960
 	R16-TP-1961 = 20000, R14-TP-1960
@@ -121,7 +124,7 @@ ENTRYCOSTMODS
 
 	// R7 Family
 	R7-Engines = 40000
-	R7-TP = 80000, RD200-TP, R7-Engines
+	R7-TP = 80000, RD200-TP, R7-Engines //Significant scale up and conversion to kerolox by Korolev allowed 1 MN class engines, R-7
 
 	// Boosters
 	R7-TP-1957 = 10000, R7-TP