MM Patch Re-Ordering & Cleanup

StoneBlue · StoneBlue · commit 61b7ae3fd062 · 2023-03-19T13:17:41.000-04:00
- Fix issues with Reviva &amp; certain MAS-supported IVAs missing MASFlightComputer, due to patch ordering in MAS
- Rename some patch file names to reflect proper MM patch ordering within passes
- Reorder some MAS patches due to relying on MASFlightComputer patch order
- Remove unnecessary NEEDS/FOR[AvionicsSystems] in some patches
- Add missing NEEDS or other pass specifiers in some mod support patches
- Rename/Relocate some mod support patch files for clarity/consistency
diff --git a/GameData/MOARdV/Patches/000_JSI-To-MAS.cfg b/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]]:FINAL	// Should run very late, to leave room for anything else to patch RPM first
+// 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]:LAST[zzz_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[*]:FINAL		// Should run very late, to leave room for every IVA mod/patch to run first?
+@INTERNAL[*]:FINAL		// Run 1st in Final pass, before ASET-to-MAS patch, MAS-to-MAS patch, and MAS_SCANsat patch
 {
 	// ---=== JSI/RasterPropMonitor Props ===--- //
 
diff --git a/GameData/MOARdV/Patches/001_ASET-To-MAS.nocfg b/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. Should run very late, to leave room for every IVA mod/patch to run first?
-@INTERNAL[*]:FINAL		//<---On patch order: what happens if another mod, patches/edits/clones a prop, and MAS applies this after?
+// 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.
 
diff --git a/GameData/MOARdV/Patches/002_MAS_Old-To-MAS_New.cfg b/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[*]:LAST[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],*
diff --git a/GameData/MOARdV/Patches/003_MAS_SCANsat.cfg b/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&!MODULE[SCANRPMStorage]]:NEEDS[SCANsat]:FINAL		// Should run very late, after JSI-to-MAS patch, due to MASFlightComputer
+// 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
 	{
diff --git a/GameData/MOARdV/Patches/MAS_AJE_IdEngine.cfg b/GameData/MOARdV/Patches/MAS_AJE_IdEngine.cfg
@@ -1,14 +1,14 @@
 // Add MASIdEngine to supported part modules.
 
-@PART[*]:HAS[@MODULE[ModuleEnginesAJEPropeller&!MODULE[MASIdEngine]]:AFTER[AJE]
+@PART[*]:HAS[@MODULE[ModuleEnginesAJEPropeller]&!MODULE[MASIdEngine]]:AFTER[AJE]
 {
 	MODULE
 	{
 		name = MASIdEngine
 	}
 }
 
-@PART[*]:HAS[@MODULE[ModuleEnginesAJEJet]&!MODULE[MASIdEngine]]]:AFTER[AJE]
+@PART[*]:HAS[@MODULE[ModuleEnginesAJEJet]&!MODULE[MASIdEngine]]:AFTER[AJE]
 {
 	MODULE
 	{
diff --git a/GameData/MOARdV/Patches/MAS_ALCOR_Orig.cfg b/GameData/MOARdV/Patches/MAS_ALCOR_Orig.cfg

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`// The MAS support piggyback patch. Adds a generic MAS module to any part that`
`2`		`-// includes an RPM module.`
`3`		`-@PART[*]:HAS[@MODULE[RasterPropMonitorComputer]&!MODULE[MASFlightComputer]]:FINAL // Should run very late, to leave room for anything else to patch RPM first`
	`2`	`+// includes an RPM module`
	`3`	`+// 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`
	`4`	`+@PART[*]:HAS[@MODULE[RasterPropMonitorComputer]&!MODULE[MASFlightComputer]]:FINAL`
`4`	`5`	`{`
`5`	`6`	`MODULE`
`6`	`7`	`{`
`@@ -23,7 +24,7 @@`
`23`	`24`	`}`
`24`	`25`	`}`
`25`	`26`
`26`		`-@PART[JSIPrimitiveExternalCamera]:LAST[zzz_AvionicsSystems]`
	`27`	`+@PART[JSIPrimitiveExternalCamera]:FOR[AvionicsSystems]`
`27`	`28`	`{`
`28`	`29`	`MODULE`
`29`	`30`	`{`
`@@ -44,7 +45,7 @@`
`44`	`45`
`45`	`46`	`// The JSI to MAS prop upgrade patch. This Module Manager patch replaces`
`46`	`47`	`// every core RPM-enabled prop with its equivalent MAS-enabled prop.`
`47`		`-@INTERNAL[*]:FINAL // Should run very late, to leave room for every IVA mod/patch to run first?`
	`48`	`+@INTERNAL[*]:FINAL // Run 1st in Final pass, before ASET-to-MAS patch, MAS-to-MAS patch, and MAS_SCANsat patch`
`48`	`49`	`{`
`49`	`50`	`// ---=== JSI/RasterPropMonitor Props ===--- //`
`50`	`51`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`	`1`	`// The ASET to MAS prop upgrade patch. This Module Manager patch replaces`
`2`	`2`	`// every ASET Avionics and ASET Props RPM-enabled prop with its equivalent`
`3`	`3`	`// MAS-enabled prop. Should run very late, to leave room for every IVA mod/patch to run first?`
`4`		`-@INTERNAL[*]:FINAL //<---On patch order: what happens if another mod, patches/edits/clones a prop, and MAS applies this after?`
	`4`	`+// Run 2nd in Final pass, after JSI-to-MAS patch, but before MAS-to-MAS & MAS_SCANsat patches`
	`5`	`+@INTERNAL[*]:FINAL`
`5`	`6`	`{`
`6`	`7`	`// TODOs found in the ALCOR IVA that may or may not be supported already.`
`7`	`8`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`	`1`	`// Because the RPM bridge for SCANsat uses a local persistent storage module,`
`2`	`2`	`// but the SCANsat MM patch only applies to RasterPropMonitor, we need our own`
`3`	`3`	`// patch here to get the persistent storage module added to our parts.`
`4`		`-@PART[*]:HAS[@MODULE[MASFlightComputer&!MODULE[SCANRPMStorage]]:NEEDS[SCANsat]:FINAL // Should run very late, after JSI-to-MAS patch, due to MASFlightComputer`
	`4`	`+// 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`
	`5`	`+@PART[*]:HAS[@MODULE[MASFlightComputer]&!MODULE[SCANRPMStorage]]:NEEDS[SCANsat]:FINAL`
`5`	`6`	`{`
`6`	`7`	`MODULE`
`7`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,14 @@`
`1`	`1`	`// Add MASIdEngine to supported part modules.`
`2`	`2`
`3`		`-@PART[*]:HAS[@MODULE[ModuleEnginesAJEPropeller&!MODULE[MASIdEngine]]:AFTER[AJE]`
	`3`	`+@PART[*]:HAS[@MODULE[ModuleEnginesAJEPropeller]&!MODULE[MASIdEngine]]:AFTER[AJE]`
`4`	`4`	`{`
`5`	`5`	`MODULE`
`6`	`6`	`{`
`7`	`7`	`name = MASIdEngine`
`8`	`8`	`}`
`9`	`9`	`}`
`10`	`10`
`11`		`-@PART[*]:HAS[@MODULE[ModuleEnginesAJEJet]&!MODULE[MASIdEngine]]]:AFTER[AJE]`
	`11`	`+@PART[*]:HAS[@MODULE[ModuleEnginesAJEJet]&!MODULE[MASIdEngine]]:AFTER[AJE]`
`12`	`12`	`{`
`13`	`13`	`MODULE`
`14`	`14`	`{`