diff --git a/GameData/MOARdV/AvionicsSystems/MAS-NavAid.cfg b/GameData/MOARdV/AvionicsSystems/MAS-NavAid.cfg deleted file mode 100644 index 66d8f42a..00000000 --- a/GameData/MOARdV/AvionicsSystems/MAS-NavAid.cfg +++ /dev/null @@ -1,421 +0,0 @@ -MAS_NAVAID -{ - NAVAID - { - name = CENTER - id = KST - celestialName = Kerbin - frequency = 113.30 - latitude = -0.06301651539 - longitude = -74.63320905499 - altitude = 160 - type = VOR DME - } - NAVAID - { - name = AIRFIELD - id = IFT - celestialName = Kerbin - frequency = 114.20 - latitude = -1.52327719495 - longitude = -71.91117281620 - altitude = 181.9 - type = VOR DME - } - NAVAID - { - name = EASTERN - id = ESI - celestialName = Kerbin - frequency = 116.40 - latitude = 5.623826026160 - longitude = -61.2651389301 - altitude = 1442 - type = VOR DME - } - NAVAID - { - name = NAME 04 - id = ID04 - celestialName = Kerbin - frequency = 112.10 - latitude = 62.66611111 - longitude = -62.80388889 - altitude = 414 - type = VOR DME - } - NAVAID - { - name = NAME 05 - id = Id05 - celestialName = Kerbin - frequency = 113.50 - latitude = -18.32527778 - longitude = -37.04583333 - altitude = 375 - type = VOR DME - } - NAVAID - { - name = NAME 06 - id = Id06 - celestialName = Kerbin - frequency = 115.10 - latitude = 29.02583333 - longitude = 99.75583333 - altitude = 770 - type = VOR DME - } - NAVAID - { - name = NAME 07 - id = Id07 - celestialName = Kerbin - frequency = 114.70 - latitude = -0.483333333 - longitude = -136.56 - altitude = 1462 - type = VOR DME - } - NAVAID - { - name = NAME 08 - id = Id08 - celestialName = Kerbin - frequency = 116.70 - latitude = -43.00055556 - longitude = -120.3222222 - altitude = 273 - type = VOR DME - } - NAVAID - { - name = NAME 09 - id = Id09 - celestialName = Kerbin - frequency = 113.80 - latitude = 30.08055556 - longitude = -151.4575 - altitude = 760 - type = VOR DME - } - NAVAID - { - name = NAME 10 - id = Id10 - celestialName = Kerbin - frequency = 115.20 - latitude = -64.81916667 - longitude = -19.24805556 - altitude = 825 - type = VOR DME - } - NAVAID - { - name = NAME 11 - id = Id11 - celestialName = Kerbin - frequency = 117.10 - latitude = -31.55277778 - longitude = 21.79694444 - altitude = 2136 - type = VOR DME - } - NAVAID - { - name = NAME 12 - id = Id12 - celestialName = Kerbin - frequency = 114.30 - latitude = 12.15083333 - longitude = 39.88027778 - altitude = 1323 - type = VOR DME - } - NAVAID - { - name = NAME 13 - id = Id13 - celestialName = Kerbin - frequency = 117.60 - latitude = -44.83583333 - longitude = 78.59611111 - altitude = 889 - type = VOR DME - } - NAVAID - { - name = NAME 14 - id = Id14 - celestialName = Kerbin - frequency = 113.10 - latitude = 70.37833333 - longitude = 41.41861111 - altitude = 1137 - type = VOR DME - } - NAVAID - { - name = NAME 15 - id = Id15 - celestialName = Kerbin - frequency = 116.60 - latitude = 54.29444444 - longitude = 99.71194444 - altitude = 632 - type = VOR DME - } - NAVAID - { - name = NAME 16 - id = Id16 - celestialName = Kerbin - frequency = 115.30 - latitude = -1.318333333 - longitude = 121.7725 - altitude = 359 - type = VOR DME - } - NAVAID - { - name = NAME 17 - id = Id17 - celestialName = Kerbin - frequency = 117.20 - latitude = -46.76027778 - longitude = 139.365 - altitude = 396 - type = VOR DME - } - NAVAID - { - name = NAME 18 - id = Id18 - celestialName = Kerbin - frequency = 115.40 - latitude = -10.15166667 - longitude = 176.5063889 - altitude = 665 - type = VOR DME - } - NAVAID - { - name = NAME 19 - id = Id19 - celestialName = Kerbin - frequency = 114.80 - latitude = 49.39444444 - longitude = 156.4013889 - altitude = 999 - type = VOR DME - } - NAVAID - { - name = NAME 20 - id = Id20 - celestialName = Kerbin - frequency = 113.90 - latitude = -70.19138889 - longitude = -155.8961111 - altitude = 798 - type = VOR DME - } - - NAVAID - { - name = KKSC ILS 27 - id = IWE - celestialName = Kerbin - frequency = 110.10 - latitude = -0.04874294553 - longitude = -74.5175 - altitude = 70 - type = NDB DME - } - NAVAID - { - name = KKSC ILS 09 - id = IKW - celestialName = Kerbin - frequency = 108.50 - latitude = -0.05023564553 - longitude = -74.69916667 - altitude = 70 - type = NDB DME - } - NAVAID - { - name = BAKOR - id = SCE - celestialName = Kerbin - frequency = 197.00 - latitude = -0.048611111 - longitude = -77.565 - altitude = 745 - type = NDB DME - } - NAVAID - { - name = BASE WEST - id = IRW - celestialName = Kerbin - frequency = 191.00 - latitude = -1.516111111 - longitude = -71.98138889 - altitude = 83.4 - type = NDB DME - } - NAVAID - { - name = BASE EAST - id = IRE - celestialName = Kerbin - frequency = 194.00 - latitude = -1.516111111 - longitude = -71.83833333 - altitude = 97.8 - type = NDB DME - } - NAVAID - { - name = NAME 03 - id = Id03 - celestialName = Kerbin - frequency = 192.00 - latitude = -20.69833333 - longitude = -28.78416667 - altitude = 1039 - type = NDB DME - } - NAVAID - { - name = NAME 04 - id = Id04 - celestialName = Kerbin - frequency = 201.00 - latitude = 0.768888888 - longitude = -10.415 - altitude = 228 - type = NDB DME - } - NAVAID - { - name = NAME 05 - id = Id05 - celestialName = Kerbin - frequency = 208.00 - latitude = 32.40972222 - longitude = 12.56833333 - altitude = 2208 - type = NDB DME - } - NAVAID - { - name = NAME 06 - id = Id06 - celestialName = Kerbin - frequency = 211.00 - latitude = -59.37 - longitude = -52.185 - altitude = 530 - type = NDB DME - } - NAVAID - { - name = NAME 07 - id = Id07 - celestialName = Kerbin - frequency = 209.00 - latitude = -64.38 - longitude = 31.59666667 - altitude = 518 - type = NDB DME - } - NAVAID - { - name = NAME 08 - id = Id08 - celestialName = Kerbin - frequency = 195.00 - latitude = -60.016111111 - longitude = 106.3916667 - altitude = 605 - type = NDB DME - } - NAVAID - { - name = NAME 09 - id = Id09 - celestialName = Kerbin - frequency = 198.00 - latitude = 4.043055556 - longitude = 85.73722222 - altitude = 476 - type = NDB DME - } - NAVAID - { - name = NAME 10 - id = Id10 - celestialName = Kerbin - frequency = 202.00 - latitude = 0.263611111 - longitude = -108.6327778 - altitude = 514 - type = NDB DME - } - NAVAID - { - name = NAME 11 - id = Id11 - celestialName = Kerbin - frequency = 203.00 - latitude = -51.96527778 - longitude = -159.4555556 - altitude = 340 - type = NDB DME - } - NAVAID - { - name = NAME 12 - id = Id12 - celestialName = Kerbin - frequency = 210.00 - latitude = 68.42277778 - longitude = -108.4788889 - altitude = 747 - type = NDB DME - } - NAVAID - { - name = KKSC ILS 09 - id = IKW - celestialName = Kerbin - frequency = 108.50 - latitude = -0.04874294553 - longitude = -74.69916667 - altitude = 70 - maximumRangeLocalizer = 30000 - maximumRangeGlidePath = 8000 - approachHeadingILS = 90 - localizerSectorILS = 17.5 - glidePathDefault = 3.0 - type = ILS DME - } - NAVAID - { - name = KKSC ILS 27 - id = IWE - celestialName = Kerbin - frequency = 110.10 - latitude = -0.05023564553 - longitude = -74.5175 - altitude = 70 - maximumRangeLocalizer = 30000 - maximumRangeGlidePath = 8000 - approachHeadingILS = 270 - localizerSectorILS = 17.5 - glidePathDefault = 3.0 - type = ILS DME - } -} diff --git a/GameData/MOARdV/Patches/MAS_NavAid.cfg b/GameData/MOARdV/AvionicsSystems/MAS_NavAid.cfg similarity index 100% rename from GameData/MOARdV/Patches/MAS_NavAid.cfg rename to GameData/MOARdV/AvionicsSystems/MAS_NavAid.cfg diff --git a/GameData/MOARdV/FlightSystems/HullcamVDS-MASCamera.cfg b/GameData/MOARdV/FlightSystems/HullcamVDS-MASCamera.cfg deleted file mode 100644 index 2ccdbd69..00000000 --- a/GameData/MOARdV/FlightSystems/HullcamVDS-MASCamera.cfg +++ /dev/null @@ -1,259 +0,0 @@ -// This patch file adds MASCamera to models from Hullcam VDS package. - -@PART[aerocam]:NEEDS[AvionicsSystems]:HAS[!MODULE[MASCamera]] -{ - MODULE - { - name = MASCamera - - fovRange = 30, 75 - fovRate = 20 - - cameraTransformName = Cylinder_002 - translation = 0.0, 0.0, 0.0 - rotation = 0, 0, 0 - - cameraName = Aerocam - } - -} - -@PART[aerocam180]:NEEDS[AvionicsSystems]:HAS[!MODULE[MASCamera]] -{ - MODULE - { - name = MASCamera - - fovRange = 30, 75 - fovRate = 20 - - cameraTransformName = Cylinder_002 - translation = 0.0, 0.0, 0.0 - rotation = 0, 0, 180 - - cameraName = Aerocam 180 - } - -} - -@PART[hc_booster]:NEEDS[AvionicsSystems]:HAS[!MODULE[MASCamera]] -{ - MODULE - { - name = MASCamera - - fovRange = 60, 90 - fovRate = 20 - - cameraTransformName = hc_booster - translation = 0.07, 0.1, 0.0 - rotation = -90, -90, 0 - - cameraName = Booster Cam Forward - } - MODULE - { - name = MASCamera - - fovRange = 60, 90 - fovRate = 20 - - cameraTransformName = hc_booster - translation = 0.07, -0.1, 0.0 - rotation = 90, 90, 0 - - cameraName = Booster Cam Aft - } -} - -@PART[hc_kazzelblad]:NEEDS[AvionicsSystems]:HAS[!MODULE[MASCamera]] -{ - MODULE - { - name = MASCamera - - fovRange = 20, 60 - fovRate = 20 - - cameraTransformName = Cylinder - translation = 0.0, -0.008, 0.3 - rotation = 0, 0, 0 - - cameraName = Kazzelblad 500 - - MODE - { - name = default - cameraResolution = 256 - shader = MOARdV/MonochromeNoise - properties = _ChannelR:1;_ChannelG:1;_ChannelB:1;_NoiseOffset:fc.RandomNormal(0, 0.135);_Blend:0.85 - fc.Random() * 0.10 - texture = ASET/ASET_Props/MFDs/ScreenPlates/noise - } - } -} - -@PART[hc_launchcam]:NEEDS[AvionicsSystems]:HAS[!MODULE[MASCamera]] -{ - MODULE - { - name = MASCamera - - fovRange = 10, 60 - fovRate = 20 - - cameraTransformName = hc_launchcam - translation = 0.0, 0.57, 0.36 - rotation = 0, 0, 0 - - cameraName = Launchpad Camera - - MODE - { - name = default - cameraResolution = 512 - } - } -} - -@PART[hc_navcam]:NEEDS[AvionicsSystems]:HAS[!MODULE[MASCamera]] -{ - MODULE - { - name = MASCamera - - fovRange = 60, 100 - fovRate = 20 - - cameraTransformName = hc_navcam - translation = 0.0, 0.009, 0.0 - rotation = -90, 0, 0 - - cameraName = NavCam - } -} - -@PART[hc_nightvision]:NEEDS[AvionicsSystems]:HAS[!MODULE[MASCamera]] -{ - MODULE - { - name = MASCamera - - fovRange = 20, 60 - fovRate = 20 - - cameraTransformName = hc_scicamera - translation = 0.0, 0.008, 0.0 - rotation = -90, 90, 0 - - cameraName = Nightvisioncam - - MODE - { - name = default - cameraResolution = 256 - shader = MOARdV/MonochromeNoise - properties = _ChannelR:0;_ChannelG:1;_ChannelB:0;_NoiseOffset:fc.RandomNormal(0, 0.135);_Blend:0.80 - fc.Random() * 0.10;_Gain:1.8 - texture = ASET/ASET_Props/MFDs/ScreenPlates/noise - } - } -} - -@PART[hc_scicam]:NEEDS[AvionicsSystems]:HAS[!MODULE[MASCamera]] -{ - MODULE - { - name = MASCamera - - fovRange = 20, 60 - fovRate = 20 - - cameraTransformName = hc_scicamera - translation = 0.0, 0.008, 0.0 - rotation = -90, 90, 0 - - cameraName = ScienceCam - MODE - { - name = default - cameraResolution = 512 - } - } -} - -@PART[hc_wideangle]:NEEDS[AvionicsSystems]:HAS[!MODULE[MASCamera]] -{ - MODULE - { - name = MASCamera - - fovRange = 100, 110 - fovRate = 10 - - cameraTransformName = hc_wideangle - translation = -0.015, -0.005, 0.100 - rotation = 0, 0, -180 - - cameraName = Wide Angle Cam - } -} - -@PART[kerbpro]:NEEDS[AvionicsSystems]:HAS[!MODULE[MASCamera]] -{ - MODULE - { - name = MASCamera - - fovRange = 20, 60 - fovRate = 20 - - cameraTransformName = lens - translation = 0.06,0.05,0.10 - rotation = -90, 180, 0 - - cameraName = KerbPro - } -} - -@PART[Telescope]:NEEDS[AvionicsSystems]:HAS[!MODULE[MASCamera]] -{ - MODULE - { - name = MASCamera - - fovRange = 0.5, 35 - fovRate = 20 - - cameraTransformName = obj_base - translation = 0.0, 0.0, 0.2 - rotation = 0, 0, 180 - - cameraName = Pictozoom 1000 - MODE - { - name = default - cameraResolution = 512 - } - } -} - -@PART[Pictozoom_2000]:NEEDS[AvionicsSystems]:HAS[!MODULE[MASCamera]] -{ - MODULE - { - name = MASCamera - - fovRange = 0.0005, 20 - fovRate = 10 - - cameraTransformName = base - translation = 0.0, 0.0, 3.0 - rotation = 0, 0, 0 - - cameraName = Pictozoom 2000 - MODE - { - name = default - cameraResolution = 512 - } - } -} diff --git a/GameData/MOARdV/FlightSystems/MAS_EngineID.cfg b/GameData/MOARdV/FlightSystems/MAS_EngineID.cfg deleted file mode 100644 index ded8925e..00000000 --- a/GameData/MOARdV/FlightSystems/MAS_EngineID.cfg +++ /dev/null @@ -1,17 +0,0 @@ -// Add MASIdEngine to supported part modules. - -@PART[*]:HAS[@MODULE[ModuleEnginesAJEPropeller]]:NEEDS[AvionicsSystems]:AFTER[AJE] -{ - MODULE - { - name = MASIdEngine - } -} - -@PART[*]:HAS[@MODULE[ModuleEnginesAJEJet]]:NEEDS[AvionicsSystems]:AFTER[AJE] -{ - MODULE - { - name = MASIdEngine - } -} diff --git a/GameData/MOARdV/Patches/JsiToMasUpgrade.cfg b/GameData/MOARdV/Patches/000_JSI-To-MAS.cfg similarity index 91% rename from GameData/MOARdV/Patches/JsiToMasUpgrade.cfg rename to GameData/MOARdV/Patches/000_JSI-To-MAS.cfg index f7bd4ffd..41befa11 100644 --- a/GameData/MOARdV/Patches/JsiToMasUpgrade.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]]: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 ===--- // diff --git a/GameData/MOARdV/Patches/AsetToMasUpgrade.nocfg b/GameData/MOARdV/Patches/001_ASET-To-MAS.nocfg similarity index 99% rename from GameData/MOARdV/Patches/AsetToMasUpgrade.nocfg rename to GameData/MOARdV/Patches/001_ASET-To-MAS.nocfg index 5c367ae1..b0913dbd 100644 --- a/GameData/MOARdV/Patches/AsetToMasUpgrade.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. -@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. diff --git a/GameData/MOARdV/Patches/MasToMasConversion.cfg b/GameData/MOARdV/Patches/002_MAS_Old-To-MAS_New.cfg similarity index 95% rename from GameData/MOARdV/Patches/MasToMasConversion.cfg rename to GameData/MOARdV/Patches/002_MAS_Old-To-MAS_New.cfg index e4996da3..cde9473e 100644 --- a/GameData/MOARdV/Patches/MasToMasConversion.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[*]: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],* diff --git a/GameData/MOARdV/AvionicsSystems/MASSCANsat.cfg b/GameData/MOARdV/Patches/003_MAS_SCANsat.cfg similarity index 53% rename from GameData/MOARdV/AvionicsSystems/MASSCANsat.cfg rename to GameData/MOARdV/Patches/003_MAS_SCANsat.cfg index 07738065..62f1b8c1 100644 --- a/GameData/MOARdV/AvionicsSystems/MASSCANsat.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]]: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 { diff --git a/GameData/MOARdV/Patches/MAS_AJE_IdEngine.cfg b/GameData/MOARdV/Patches/MAS_AJE_IdEngine.cfg new file mode 100644 index 00000000..6d68e7ae --- /dev/null +++ b/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 + } +} diff --git a/GameData/MOARdV/FlightSystems/MAS_ALCOR.cfg b/GameData/MOARdV/Patches/MAS_ALCOR_Orig.cfg similarity index 94% rename from GameData/MOARdV/FlightSystems/MAS_ALCOR.cfg rename to GameData/MOARdV/Patches/MAS_ALCOR_Orig.cfg index dbe3a2ee..2d2a3814 100644 --- a/GameData/MOARdV/FlightSystems/MAS_ALCOR.cfg +++ b/GameData/MOARdV/Patches/MAS_ALCOR_Orig.cfg @@ -1,6 +1,6 @@ // Add a MASCamera to the ASET external camera part. -@PART[ExtCamRadialVErt]:NEEDS[AvionicsSystems] +@PART[ExtCamRadialVErt]:NEEDS[ASET/ExtCamRadialVert] //Orig. ASET version, **NOT** ASET Consolidated vers. { MODULE { @@ -45,7 +45,7 @@ } } -@PART[ALCOR_LanderCapsule] +@PART[ALCOR_LanderCapsule]:NEEDS[ASET/ALCOR_LanderCapsule] //Orig. ASET version, **NOT** ASET Consolidated vers. { %MODULE[ModuleDataTransmitter] { @@ -61,7 +61,7 @@ %packetCeiling = 5 } - MODULE:NEEDS[AvionicsSystems] + MODULE { name = MASFlightComputer requiresPower = true @@ -84,7 +84,7 @@ } } - MODULE:NEEDS[AvionicsSystems] + MODULE { name = MASCamera @@ -119,7 +119,7 @@ } } - MODULE:NEEDS[AvionicsSystems] + MODULE { name = MASCamera @@ -154,7 +154,7 @@ } } - MODULE:NEEDS[AvionicsSystems] + MODULE { name = MASCamera @@ -189,7 +189,7 @@ } } - MODULE:NEEDS[AvionicsSystems] + MODULE { name = MASCamera diff --git a/GameData/MOARdV/Patches/MAS_APEx_IdEngineGroup.cfg b/GameData/MOARdV/Patches/MAS_APEx_IdEngineGroup.cfg index 575600d9..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]]:NEEDS[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 28c314d3..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]:NEEDS[kOS|kOSPropMonitor]:FINAL +@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_EngineID.cfg b/GameData/MOARdV/Patches/MAS_EngineID.cfg deleted file mode 100644 index ded8925e..00000000 --- a/GameData/MOARdV/Patches/MAS_EngineID.cfg +++ /dev/null @@ -1,17 +0,0 @@ -// Add MASIdEngine to supported part modules. - -@PART[*]:HAS[@MODULE[ModuleEnginesAJEPropeller]]:NEEDS[AvionicsSystems]:AFTER[AJE] -{ - MODULE - { - name = MASIdEngine - } -} - -@PART[*]:HAS[@MODULE[ModuleEnginesAJEJet]]:NEEDS[AvionicsSystems]:AFTER[AJE] -{ - MODULE - { - name = MASIdEngine - } -} diff --git a/GameData/MOARdV/Patches/HullcamVDS-MASCamera.cfg b/GameData/MOARdV/Patches/MAS_HullcamVDS.cfg similarity index 81% rename from GameData/MOARdV/Patches/HullcamVDS-MASCamera.cfg rename to GameData/MOARdV/Patches/MAS_HullcamVDS.cfg index 2ccdbd69..2e7b88b6 100644 --- a/GameData/MOARdV/Patches/HullcamVDS-MASCamera.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]:NEEDS[AvionicsSystems]:HAS[!MODULE[MASCamera]] +@PART[aerocam]:HAS[!MODULE[MASCamera]]:FOR[AvionicsSystems] { MODULE { @@ -18,7 +18,7 @@ } -@PART[aerocam180]:NEEDS[AvionicsSystems]:HAS[!MODULE[MASCamera]] +@PART[aerocam180]:HAS[!MODULE[MASCamera]]:FOR[AvionicsSystems] { MODULE { @@ -36,7 +36,7 @@ } -@PART[hc_booster]:NEEDS[AvionicsSystems]:HAS[!MODULE[MASCamera]] +@PART[hc_booster]:HAS[!MODULE[MASCamera]]:FOR[AvionicsSystems] { MODULE { @@ -66,7 +66,7 @@ } } -@PART[hc_kazzelblad]:NEEDS[AvionicsSystems]:HAS[!MODULE[MASCamera]] +@PART[hc_kazzelblad]:HAS[!MODULE[MASCamera]]:FOR[AvionicsSystems] { MODULE { @@ -92,7 +92,7 @@ } } -@PART[hc_launchcam]:NEEDS[AvionicsSystems]:HAS[!MODULE[MASCamera]] +@PART[hc_launchcam]:HAS[!MODULE[MASCamera]]:FOR[AvionicsSystems] { MODULE { @@ -115,7 +115,7 @@ } } -@PART[hc_navcam]:NEEDS[AvionicsSystems]:HAS[!MODULE[MASCamera]] +@PART[hc_navcam]:HAS[!MODULE[MASCamera]]:FOR[AvionicsSystems] { MODULE { @@ -132,7 +132,7 @@ } } -@PART[hc_nightvision]:NEEDS[AvionicsSystems]:HAS[!MODULE[MASCamera]] +@PART[hc_nightvision]:HAS[!MODULE[MASCamera]]:FOR[AvionicsSystems] { MODULE { @@ -158,7 +158,7 @@ } } -@PART[hc_scicam]:NEEDS[AvionicsSystems]:HAS[!MODULE[MASCamera]] +@PART[hc_scicam]:HAS[!MODULE[MASCamera]]:FOR[AvionicsSystems] { MODULE { @@ -180,7 +180,7 @@ } } -@PART[hc_wideangle]:NEEDS[AvionicsSystems]:HAS[!MODULE[MASCamera]] +@PART[hc_wideangle]:HAS[!MODULE[MASCamera]]:FOR[AvionicsSystems] { MODULE { @@ -197,7 +197,7 @@ } } -@PART[kerbpro]:NEEDS[AvionicsSystems]:HAS[!MODULE[MASCamera]] +@PART[kerbpro]:HAS[!MODULE[MASCamera]]:FOR[AvionicsSystems] { MODULE { @@ -214,7 +214,7 @@ } } -@PART[Telescope]:NEEDS[AvionicsSystems]:HAS[!MODULE[MASCamera]] +@PART[Telescope]:HAS[!MODULE[MASCamera]]:FOR[AvionicsSystems] { MODULE { @@ -236,7 +236,7 @@ } } -@PART[Pictozoom_2000]:NEEDS[AvionicsSystems]:HAS[!MODULE[MASCamera]] +@PART[Pictozoom_2000]:HAS[!MODULE[MASCamera]]:FOR[AvionicsSystems] { MODULE { diff --git a/GameData/MOARdV/Patches/MAS_MorseCode.cfg b/GameData/MOARdV/Patches/MAS_MorseCode.cfg deleted file mode 100644 index 1032eeec..00000000 --- a/GameData/MOARdV/Patches/MAS_MorseCode.cfg +++ /dev/null @@ -1,31 +0,0 @@ -MAS_MORSE_CODE -{ - // NOTE: all letters are always capitalized when converting to Morse Code. - // 'a' and 'A' are the same. - A = MOARdV/Sounds/morse_A - B = MOARdV/Sounds/morse_B - C = MOARdV/Sounds/morse_C - D = MOARdV/Sounds/morse_D - E = MOARdV/Sounds/morse_E - F = MOARdV/Sounds/morse_F - G = MOARdV/Sounds/morse_G - H = MOARdV/Sounds/morse_H - I = MOARdV/Sounds/morse_I - J = MOARdV/Sounds/morse_J - K = MOARdV/Sounds/morse_K - L = MOARdV/Sounds/morse_L - M = MOARdV/Sounds/morse_M - N = MOARdV/Sounds/morse_N - O = MOARdV/Sounds/morse_O - P = MOARdV/Sounds/morse_P - Q = MOARdV/Sounds/morse_Q - R = MOARdV/Sounds/morse_R - S = MOARdV/Sounds/morse_S - T = MOARdV/Sounds/morse_T - U = MOARdV/Sounds/morse_U - V = MOARdV/Sounds/morse_V - W = MOARdV/Sounds/morse_W - X = MOARdV/Sounds/morse_X - Y = MOARdV/Sounds/morse_Y - Z = MOARdV/Sounds/morse_Z -} diff --git a/GameData/MOARdV/Patches/MAS_SCANsat.cfg b/GameData/MOARdV/Patches/MAS_SCANsat.cfg deleted file mode 100644 index 07738065..00000000 --- a/GameData/MOARdV/Patches/MAS_SCANsat.cfg +++ /dev/null @@ -1,10 +0,0 @@ -// 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] -{ - MODULE - { - name = SCANRPMStorage - } -} diff --git a/GameData/MOARdV/FlightSystems/SDHI.cfg b/GameData/MOARdV/Patches/MAS_SDHI.cfg similarity index 82% rename from GameData/MOARdV/FlightSystems/SDHI.cfg rename to GameData/MOARdV/Patches/MAS_SDHI.cfg index a077ccbf..262acd03 100644 --- a/GameData/MOARdV/FlightSystems/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[AvionicsSystems] +@PART[SDHI_ParaDock_1_ClampOTron]:HAS[!MODULE[MASRadar]&!MODULE[MASCamera]]:FOR[AvionicsSystems] { MODULE { @@ -35,7 +35,7 @@ } } -@PART[SDHI_ParaDock_2_IACBM]:NEEDS[AvionicsSystems] +@PART[SDHI_ParaDock_2_IACBM]:HAS[!MODULE[MASRadar]&!MODULE[MASCamera]]:FOR[AvionicsSystems] { MODULE {