AJ10 Merge

- Merged AJ10-118F and 118K - Remove old GEM-63 (repurposed GEM-60XL Part)
KSP-RO · Aug 11, 2024 · f756f64 · f756f64
1 parent 3b2fb3c
commit f756f64
Show file tree

Hide file tree

Showing 4 changed files with 166 additions and 131 deletions.
diff --git a/GameData/RealismOverhaul/RO_SuggestedMods/Bluedog_DB/Delta/RO_Delta_Engines.cfg b/GameData/RealismOverhaul/RO_SuggestedMods/Bluedog_DB/Delta/RO_Delta_Engines.cfg
@@ -3,58 +3,78 @@
 //	================================================================================
 
 
-//	================================================================================
-//	AJ10-118 Configs
-//	================================================================================
-
-
-//	AJ10 118F
+//	AJ10 Advanced
 @PART[bluedog_AJ10_118F]:FOR[RealismOverhaul]
 {
 	%RSSROConfig = True
 	%rescaleFactor = 1.6
-	%engineType = AJ10_Adv
-}
-@PART[bluedog_AJ10_118F]:AFTER[RealismOverhaulEngines]
-{
-	@MODULE[ModuleEngineConfigs]
+	!MODULE[ModuleB9PartSwitch]:HAS[#moduleID[engineSwitch]] {}
+	MODULE
 	{
-		@configuration = AJ10-118F
-		!CONFIG[AJ10-138] {}
-		!CONFIG[AJ10-118K] {}
-		!CONFIG[AJ10-133-Hylas] {}
+		name = ModuleB9PartSwitch
+		moduleID = nozzle
+		SUBTYPE
+		{
+			name = 118F
+			transform = Bluedog_DB/Parts/Delta/DeltaK/bluedog_AJ10_118F(Clone)
+			MODULE
+			{
+				IDENTIFIER
+				{
+					name = ModuleDeployableEngine
+				}
+				moduleActive = false
+			}
+		}
+		SUBTYPE
+		{
+			name = 118K
+			transform = Bluedog_DB/Parts/Delta/DeltaK/bluedog_AJ10_118K(Clone)
+			MODULE
+			{
+				IDENTIFIER
+				{
+					name = ModuleDeployableEngine
+				}
+				moduleActive = false
+			}
+		}
+	}
+	MODULE
+	{
+		name = ModuleB9DisableTransform
+		transform = Bluedog_DB/Parts/Delta/DeltaK/bluedog_AJ10_118X(Clone)
 	}
-	@title = AJ10-118F
-	@description = A further improvement on the AJ10 family, the AJ10-118F uses a larger engine bell to achieve superior performance. Used on the Delta F upper stage.
-}
-
-
-//	AJ10 118K
-@PART[bluedog_AJ10_118K]:FOR[RealismOverhaul]
-{
-	%RSSROConfig = True
-	%rescaleFactor = 1.6
 	%engineType = AJ10_Adv
 }
-@PART[bluedog_AJ10_118K]:AFTER[RealismOverhaulEngines]
+@PART[bluedog_AJ10_118F]:AFTER[RealismOverhaulEngines]
 {
 	@MODULE[ModuleEngineConfigs]
 	{
-		@configuration = AJ10-118K
-		!CONFIG[AJ10-138] {}
-		!CONFIG[AJ10-118F] {}
-		!CONFIG[AJ10-133-Hylas] {}
+		@CONFIG[AJ10-138]
+		{
+			%LinkB9PSModule[nozzle] { subtype = 118F }
+		}
+		@CONFIG[AJ10-118F]
+		{
+			%LinkB9PSModule[nozzle] { subtype = 118F }
+		}
+		@CONFIG[AJ10-118K]
+		{
+			%LinkB9PSModule[nozzle] { subtype = 118K }
+		}
+		@CONFIG[AJ10-133-Hylas]
+		{
+			%LinkB9PSModule[nozzle] { subtype = 118F }
+		}
+		@CONFIG[AJ10-133-LH]
+		{
+			%LinkB9PSModule[nozzle] { subtype = 118F }
+		}
 	}
-	@title = AJ10-118K
-	@description = Main engine for the Delta-K upper stage. A further advancement on the AJ10 engine line. This one has a very large engine bell.
 }
 
 
-//	================================================================================
-//	TR-201 Configs
-//	================================================================================
-
-
 //	TR-201
 @PART[bluedog_TR_201]:FOR[RealismOverhaul]
 {
@@ -78,11 +98,6 @@
 }
 
 
-//	================================================================================
-//	First Stage Engine Configs
-//	================================================================================
-
-
 //	RS-68
 @PART[bluedog_DeltaIV_RS68]:FOR[RealismOverhaul]
 {

diff --git a/GameData/RealismOverhaul/RO_SuggestedMods/Bluedog_DB/Delta/RO_GEM.cfg b/GameData/RealismOverhaul/RO_SuggestedMods/Bluedog_DB/Delta/RO_GEM.cfg
@@ -21,12 +21,12 @@
 		SUBTYPE
 		{
 			name = Ground
-			transform = GroundLit
+			transform = GroundLitBell
 		}
 		SUBTYPE
 		{
 			name = Air
-			transform = AirLit
+			transform = AirLitBell
 		}
 	}
 }
@@ -98,12 +98,12 @@
 		SUBTYPE
 		{
 			name = Ground
-			transform = GroundLit
+			transform = GroundLitBell
 		}
 		SUBTYPE
 		{
 			name = Air
-			transform = AirLit
+			transform = AirLitBell
 		}
 	}
 	%engineType = GEM-46
@@ -130,17 +130,13 @@
 	%RSSROConfig = True
 	%rescaleFactor = 1.6
 	%engineType = GEM-60
-}
-
-
-//	GEM 63
-@PART[bluedog_Delta_GEM60XL]:FOR[RealismOverhaul]
-{
-	%RSSROConfig = True
-	%rescaleFactor = 1.7173
-	@MODEL
+	@MODULE[ModuleB9PartSwitch]:HAS[#moduleID[engineSwitch]]
+	{
+		!SUBTYPE[GEM-60XL] {}
+	}
+	MODULE
 	{
-		%scale = 1, 0.9481132, 1
+		name = ModuleB9DisableTransform
+		transform = GEM60XL
 	}
-	%engineType = GEM-63
 }