Skip to content

Commit 8a6b259

Browse files
committed
MM Patch Re-Ordering & Cleanup
- Fix issues with Reviva & 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
1 parent 161f0c8 commit 8a6b259

17 files changed

+47
-785
lines changed

GameData/MOARdV/AvionicsSystems/MAS-NavAid.cfg

Lines changed: 0 additions & 421 deletions
This file was deleted.
File renamed without changes.

GameData/MOARdV/FlightSystems/HullcamVDS-MASCamera.cfg

Lines changed: 0 additions & 259 deletions
This file was deleted.

GameData/MOARdV/FlightSystems/MAS_EngineID.cfg

Lines changed: 0 additions & 17 deletions
This file was deleted.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// The MAS support piggyback patch. Adds a generic MAS module to any part that
22
// includes an RPM module.
3-
@PART[*]:HAS[@MODULE[RasterPropMonitorComputer],!MODULE[MASFlightComputer]]:NEEDS[AvionicsSystems]
3+
@PART[*]:HAS[@MODULE[RasterPropMonitorComputer],!MODULE[MASFlightComputer]]:FINAL // Should run very late, to leave room for anything else to patch RPM first
44
{
55
MODULE
66
{
@@ -23,7 +23,7 @@
2323
}
2424
}
2525

26-
@PART[JSIPrimitiveExternalCamera]:NEEDS[AvionicsSystems]
26+
@PART[JSIPrimitiveExternalCamera]:LAST[zzz_AvionicsSystems]
2727
{
2828
MODULE
2929
{
@@ -44,7 +44,7 @@
4444

4545
// The JSI to MAS prop upgrade patch. This Module Manager patch replaces
4646
// every core RPM-enabled prop with its equivalent MAS-enabled prop.
47-
@INTERNAL[*]:NEEDS[AvionicsSystems]
47+
@INTERNAL[*]:FINAL // Should run very late, to leave room for every IVA mod/patch to run first?
4848
{
4949
// ---=== JSI/RasterPropMonitor Props ===--- //
5050

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// The ASET to MAS prop upgrade patch. This Module Manager patch replaces
22
// every ASET Avionics and ASET Props RPM-enabled prop with its equivalent
3-
// MAS-enabled prop.
4-
@INTERNAL[*]:NEEDS[AvionicsSystems]
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?
55
{
66
// TODOs found in the ALCOR IVA that may or may not be supported already.
77

GameData/MOARdV/AvionicsSystems/MASSCANsat.cfg renamed to GameData/MOARdV/Patches/001_MAS_SCANsat.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Because the RPM bridge for SCANsat uses a local persistent storage module,
22
// but the SCANsat MM patch only applies to RasterPropMonitor, we need our own
33
// patch here to get the persistent storage module added to our parts.
4-
@PART[*]:HAS[@MODULE[MASFlightComputer]]:AFTER[AvionicsSystems]:NEEDS[SCANsat]
4+
@PART[*]:HAS[@MODULE[MASFlightComputer&!MODULE[SCANRPMStorage]]:FINAL // Should run very late, after JSI-to-MAS patch, due to MASFlightComputer
55
{
66
MODULE
77
{
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// Add MASIdEngine to supported part modules.
2+
3+
@PART[*]:HAS[@MODULE[ModuleEnginesAJEPropeller]]:AFTER[AJE]
4+
{
5+
MODULE
6+
{
7+
name = MASIdEngine
8+
}
9+
}
10+
11+
@PART[*]:HAS[@MODULE[ModuleEnginesAJEJet]]:AFTER[AJE]
12+
{
13+
MODULE
14+
{
15+
name = MASIdEngine
16+
}
17+
}

0 commit comments

Comments
 (0)