Semi-Critical MM Patch Re-Ordering & Cleanup

GameData/MOARdV/Patches/JsiToMasUpgrade.cfg → GameData/MOARdV/Patches/000_JSI-To-MAS.cfg

@@ -1,6 +1,7 @@
 // The MAS support piggyback patch.  Adds a generic MAS module to any part that
-// includes an RPM module.
-@PART[*]:HAS[@MODULE[RasterPropMonitorComputer],!MODULE[MASFlightComputer]]:NEEDS[AvionicsSystems]
+// includes an RPM module
+// Should run very late, to leave room for anything else to patch RPM first. Run 1st in Final pass, before ASET-To-MAS, MAS-to-MAS & MAS_SCANsat patches
+@PART[*]:HAS[@MODULE[RasterPropMonitorComputer]&!MODULE[MASFlightComputer]]:FINAL
 {
 	MODULE
 	{
@@ -23,7 +24,7 @@
 	}
 }
 
-@PART[JSIPrimitiveExternalCamera]:NEEDS[AvionicsSystems]
+@PART[JSIPrimitiveExternalCamera]:FOR[AvionicsSystems]
 {
 	MODULE
 	{
@@ -44,7 +45,7 @@
 
 // The JSI to MAS prop upgrade patch.  This Module Manager patch replaces
 // every core RPM-enabled prop with its equivalent MAS-enabled prop.
-@INTERNAL[*]:NEEDS[AvionicsSystems]
+@INTERNAL[*]:FINAL		// Run 1st in Final pass, before ASET-to-MAS patch, MAS-to-MAS patch, and MAS_SCANsat patch
 {
 	// ---=== JSI/RasterPropMonitor Props ===--- //
 

GameData/MOARdV/Patches/AsetToMasUpgrade.nocfg → GameData/MOARdV/Patches/001_ASET-To-MAS.nocfg

@@ -1,7 +1,8 @@
 // The ASET to MAS prop upgrade patch.  This Module Manager patch replaces
 // every ASET Avionics and ASET Props RPM-enabled prop with its equivalent
-// MAS-enabled prop.
-@INTERNAL[*]:NEEDS[AvionicsSystems]
+// MAS-enabled prop. Should run very late, to leave room for every IVA mod/patch to run first?
+// Run 2nd in Final pass, after JSI-to-MAS patch, but before MAS-to-MAS & MAS_SCANsat patches
+@INTERNAL[*]:FINAL
 {
 	// TODOs found in the ALCOR IVA that may or may not be supported already.
 

GameData/MOARdV/Patches/MasToMasConversion.cfg → GameData/MOARdV/Patches/002_MAS_Old-To-MAS_New.cfg

@@ -1,7 +1,8 @@
 // The MAS to MAS prop conversion patch.  This Module Manager patch replaces
 // old MAS prop names with the updated nomenclature, so the handful of old
 // IVAs don't have to be rebuilt.
-@INTERNAL[*]:NEEDS[AvionicsSystems]
+// Run 3rd in Final pass, after JSI-to-MAS & ASET-to-MAS patches, but before MAS_SCANsat patch
+@INTERNAL[*]:FINAL
 {
 	// IndicatorPanel5x3
 	@PROP[MAS_IP5x3_Alarm],*

GameData/MOARdV/AvionicsSystems/MASSCANsat.cfg → GameData/MOARdV/Patches/003_MAS_SCANsat.cfg

@@ -1,7 +1,8 @@
 // Because the RPM bridge for SCANsat uses a local persistent storage module,
 // but the SCANsat MM patch only applies to RasterPropMonitor, we need our own
 // patch here to get the persistent storage module added to our parts.
-@PART[*]:HAS[@MODULE[MASFlightComputer]]:AFTER[AvionicsSystems]:NEEDS[SCANsat]
+// Should run very late, after JSI-to-MAS patch, due to MASFlightComputer. Run last in Final pass, after JSI-to-MAS, ASET-to-MAS, MAS-to-MAS patches
+@PART[*]:HAS[@MODULE[MASFlightComputer]&!MODULE[SCANRPMStorage]]:NEEDS[SCANsat]:FINAL
 {
 	MODULE
 	{

GameData/MOARdV/Patches/MAS_AJE_IdEngine.cfg

@@ -0,0 +1,17 @@
+// Add MASIdEngine to supported part modules.
+
+@PART[*]:HAS[@MODULE[ModuleEnginesAJEPropeller]&!MODULE[MASIdEngine]]:AFTER[AJE]
+{
+	MODULE
+	{
+		name = MASIdEngine
+	}
+}
+
+@PART[*]:HAS[@MODULE[ModuleEnginesAJEJet]&!MODULE[MASIdEngine]]:AFTER[AJE]
+{
+	MODULE
+	{
+		name = MASIdEngine
+	}
+}