2nd round of corrections for MAS patch ordering

Author: StoneBlue

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

@@ -1,6 +1,6 @@
 // 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
+@PART[*]:HAS[@MODULE[RasterPropMonitorComputer]&!MODULE[MASFlightComputer]]:FINAL	// Should run very late, to leave room for anything else to patch RPM first
 {
 	MODULE
 	{

GameData/MOARdV/Patches/001_MAS_SCANsat.cfg

@@ -1,7 +1,7 @@
 // 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]]:FINAL		// Should run very late, after JSI-to-MAS patch, due to MASFlightComputer
+@PART[*]:HAS[@MODULE[MASFlightComputer&!MODULE[SCANRPMStorage]]:NEEDS[SCANsat]:FINAL		// Should run very late, after JSI-to-MAS patch, due to MASFlightComputer
 {
 	MODULE
 	{

GameData/MOARdV/Patches/MAS_AJE_IdEngine.cfg

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

GameData/MOARdV/Patches/MAS_APEx_IdEngineGroup.cfg

@@ -1,6 +1,6 @@
 // Add MASIdEngineGroup to supported part modules.
 
-@PART[*]:HAS[@MODULE[ModuleEnginesFX]]:LAST[AvionicsSystems]
+@PART[*]:HAS[@MODULE[ModuleEnginesFX]&!MODULE[MASIdEngineGroup]]:LAST[AvionicsSystems]
 {
 	MODULE
 	{

GameData/MOARdV/Patches/MAS_APEx_MFD40x20_kOS_PropMonitor.cfg

@@ -1,4 +1,4 @@
-@PROP[MAS_APEx_MFD40x20_kOS]:LAST[kOS|kOSPropMonitor]
+@PROP[MAS_APEx_MFD40x20_kOS]:LAST[kOSPropMonitor]
 {
 	@MODULE[RasterPropMonitor]
 	{
@@ -11,9 +11,9 @@
 			//Main
 			name = kOSRPMPage
 			button = button_G
-			textureURL = kPM/Library/Textures/kPM40x20Alt			
+			textureURL = kPM/Library/Textures/kPM40x20Alt
 
-			disableSwitchingTo=pALCORSTBY40x20,pALCORPFD40x20,pTargetMenu40x20,DPAI,pALCORMapOrbit40x20,pALCORMapLanding40x20,pAutopilot40x20,ALCORGraphAltAtmAltDynPressAtm40x20,ALCORGraphTerrainHeightScaner40x20,vesselView,pALCORAscDes40x20,pALCORLanding40x20,pALCORorbit40x20,pALCORorbitDisplay40x20,JSIOrbitDisplay,pALCORDocking40x20,pALCORDocking40x20cross,pALCORshipinfo40x20,pFlightLog40x20,pALCORCrew40x20,pALCORExtCam40x20,pExtCam-1-40x20
+			disableSwitchingTo = pALCORSTBY40x20,pALCORPFD40x20,pTargetMenu40x20,DPAI,pALCORMapOrbit40x20,pALCORMapLanding40x20,pAutopilot40x20,ALCORGraphAltAtmAltDynPressAtm40x20,ALCORGraphTerrainHeightScaner40x20,vesselView,pALCORAscDes40x20,pALCORLanding40x20,pALCORorbit40x20,pALCORorbitDisplay40x20,JSIOrbitDisplay,pALCORDocking40x20,pALCORDocking40x20cross,pALCORshipinfo40x20,pFlightLog40x20,pALCORCrew40x20,pALCORExtCam40x20,pExtCam-1-40x20
 
 			PAGEHANDLER
 			{

GameData/MOARdV/Patches/MAS_HullcamVDS.cfg

@@ -1,6 +1,6 @@
 // This patch file adds MASCamera to models from Hullcam VDS package.
 
-@PART[aerocam]:HAS[!MODULE[MASCamera]]:NEEDS[HullcamVDSContinued]
+@PART[aerocam]:HAS[!MODULE[MASCamera]]:FOR[AvionicsSystems]
 {
 	MODULE
 	{
@@ -18,7 +18,7 @@
 
 }
 
-@PART[aerocam180]:HAS[!MODULE[MASCamera]]:NEEDS[HullcamVDSContinued]
+@PART[aerocam180]:HAS[!MODULE[MASCamera]]:FOR[AvionicsSystems]
 {
 	MODULE
 	{
@@ -36,7 +36,7 @@
 
 }
 
-@PART[hc_booster]:HAS[!MODULE[MASCamera]]:NEEDS[HullcamVDSContinued]
+@PART[hc_booster]:HAS[!MODULE[MASCamera]]:FOR[AvionicsSystems]
 {
 	MODULE
 	{
@@ -66,7 +66,7 @@
 	}
 }
 
-@PART[hc_kazzelblad]:HAS[!MODULE[MASCamera]]:NEEDS[HullcamVDSContinued]
+@PART[hc_kazzelblad]:HAS[!MODULE[MASCamera]]:FOR[AvionicsSystems]
 {
 	MODULE
 	{
@@ -92,7 +92,7 @@
 	}
 }
 
-@PART[hc_launchcam]:HAS[!MODULE[MASCamera]]:NEEDS[HullcamVDSContinued]
+@PART[hc_launchcam]:HAS[!MODULE[MASCamera]]:FOR[AvionicsSystems]
 {
 	MODULE
 	{
@@ -115,7 +115,7 @@
 	}
 }
 
-@PART[hc_navcam]:HAS[!MODULE[MASCamera]]:NEEDS[HullcamVDSContinued]
+@PART[hc_navcam]:HAS[!MODULE[MASCamera]]:FOR[AvionicsSystems]
 {
 	MODULE
 	{
@@ -132,7 +132,7 @@
 	}
 }
 
-@PART[hc_nightvision]:HAS[!MODULE[MASCamera]]:NEEDS[HullcamVDSContinued]
+@PART[hc_nightvision]:HAS[!MODULE[MASCamera]]:FOR[AvionicsSystems]
 {
 	MODULE
 	{
@@ -158,7 +158,7 @@
 	}
 }
 
-@PART[hc_scicam]:HAS[!MODULE[MASCamera]]:NEEDS[HullcamVDSContinued]
+@PART[hc_scicam]:HAS[!MODULE[MASCamera]]:FOR[AvionicsSystems]
 {
 	MODULE
 	{
@@ -180,7 +180,7 @@
 	}
 }
 
-@PART[hc_wideangle]:HAS[!MODULE[MASCamera]]:NEEDS[HullcamVDSContinued]
+@PART[hc_wideangle]:HAS[!MODULE[MASCamera]]:FOR[AvionicsSystems]
 {
 	MODULE
 	{
@@ -197,7 +197,7 @@
 	}
 }
 
-@PART[kerbpro]:HAS[!MODULE[MASCamera]]:NEEDS[HullcamVDSContinued]
+@PART[kerbpro]:HAS[!MODULE[MASCamera]]:FOR[AvionicsSystems]
 {
 	MODULE
 	{
@@ -214,7 +214,7 @@
 	}
 }
 
-@PART[Telescope]:HAS[!MODULE[MASCamera]]:NEEDS[HullcamVDSContinued]
+@PART[Telescope]:HAS[!MODULE[MASCamera]]:FOR[AvionicsSystems]
 {
 	MODULE
 	{
@@ -236,7 +236,7 @@
 	}
 }
 
-@PART[Pictozoom_2000]:HAS[!MODULE[MASCamera]]:NEEDS[HullcamVDSContinued]
+@PART[Pictozoom_2000]:HAS[!MODULE[MASCamera]]:FOR[AvionicsSystems]
 {
 	MODULE
 	{

GameData/MOARdV/Patches/MAS_SDHI.cfg

@@ -1,6 +1,6 @@
 // Update SDHI para/dock parts to include 250km radar + docking port camera
 
-@PART[SDHI_ParaDock_1_ClampOTron]:NEEDS[SDHI]
+@PART[SDHI_ParaDock_1_ClampOTron]:HAS[!MODULE[MASRadar]&!MODULE[MASCamera]]:FOR[AvionicsSystems]
 {
 	MODULE
 	{
@@ -35,7 +35,7 @@
 	}
 }
 
-@PART[SDHI_ParaDock_2_IACBM]:NEEDS[SDHI]
+@PART[SDHI_ParaDock_2_IACBM]:HAS[!MODULE[MASRadar]&!MODULE[MASCamera]]:FOR[AvionicsSystems]
 {
 	MODULE
 	{