From ab4fc12ed6d1eca5acc8ebc50669ef5c8ec20c48 Mon Sep 17 00:00:00 2001 From: StoneBlue Date: Sun, 19 Mar 2023 06:29:45 -0400 Subject: [PATCH] 2nd round of corrections for MAS patch ordering --- GameData/MOARdV/Patches/000_JSI-To-MAS.cfg | 2 +- GameData/MOARdV/Patches/001_MAS_SCANsat.cfg | 2 +- GameData/MOARdV/Patches/MAS_AJE_IdEngine.cfg | 4 ++-- .../MOARdV/Patches/MAS_APEx_IdEngineGroup.cfg | 2 +- .../MAS_APEx_MFD40x20_kOS_PropMonitor.cfg | 6 ++--- GameData/MOARdV/Patches/MAS_HullcamVDS.cfg | 24 +++++++++---------- GameData/MOARdV/Patches/MAS_SDHI.cfg | 4 ++-- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/GameData/MOARdV/Patches/000_JSI-To-MAS.cfg b/GameData/MOARdV/Patches/000_JSI-To-MAS.cfg index 99ff8969..ec8540c5 100644 --- a/GameData/MOARdV/Patches/000_JSI-To-MAS.cfg +++ b/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 { diff --git a/GameData/MOARdV/Patches/001_MAS_SCANsat.cfg b/GameData/MOARdV/Patches/001_MAS_SCANsat.cfg index e88321b5..61117c95 100644 --- a/GameData/MOARdV/Patches/001_MAS_SCANsat.cfg +++ b/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 { diff --git a/GameData/MOARdV/Patches/MAS_AJE_IdEngine.cfg b/GameData/MOARdV/Patches/MAS_AJE_IdEngine.cfg index 43a4e720..257cc3ed 100644 --- a/GameData/MOARdV/Patches/MAS_AJE_IdEngine.cfg +++ b/GameData/MOARdV/Patches/MAS_AJE_IdEngine.cfg @@ -1,6 +1,6 @@ // Add MASIdEngine to supported part modules. -@PART[*]:HAS[@MODULE[ModuleEnginesAJEPropeller]]:AFTER[AJE] +@PART[*]:HAS[@MODULE[ModuleEnginesAJEPropeller&!MODULE[MASIdEngine]]:AFTER[AJE] { MODULE { @@ -8,7 +8,7 @@ } } -@PART[*]:HAS[@MODULE[ModuleEnginesAJEJet]]:AFTER[AJE] +@PART[*]:HAS[@MODULE[ModuleEnginesAJEJet]&!MODULE[MASIdEngine]]]:AFTER[AJE] { MODULE { diff --git a/GameData/MOARdV/Patches/MAS_APEx_IdEngineGroup.cfg b/GameData/MOARdV/Patches/MAS_APEx_IdEngineGroup.cfg index 5aa16c6f..8f7af4a4 100644 --- a/GameData/MOARdV/Patches/MAS_APEx_IdEngineGroup.cfg +++ b/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 { diff --git a/GameData/MOARdV/Patches/MAS_APEx_MFD40x20_kOS_PropMonitor.cfg b/GameData/MOARdV/Patches/MAS_APEx_MFD40x20_kOS_PropMonitor.cfg index 608a0990..19d2e326 100644 --- a/GameData/MOARdV/Patches/MAS_APEx_MFD40x20_kOS_PropMonitor.cfg +++ b/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 { diff --git a/GameData/MOARdV/Patches/MAS_HullcamVDS.cfg b/GameData/MOARdV/Patches/MAS_HullcamVDS.cfg index b094fac4..2e7b88b6 100644 --- a/GameData/MOARdV/Patches/MAS_HullcamVDS.cfg +++ b/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 { diff --git a/GameData/MOARdV/Patches/MAS_SDHI.cfg b/GameData/MOARdV/Patches/MAS_SDHI.cfg index 4c56fe1f..262acd03 100644 --- a/GameData/MOARdV/Patches/MAS_SDHI.cfg +++ b/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 {