Skip to content

Commit

Permalink
MM Patch Re-Ordering & Cleanup
Browse files Browse the repository at this point in the history
- 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
  • Loading branch information
StoneBlue committed Mar 19, 2023
1 parent ab4fc12 commit 61b7ae3
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 9 deletions.
9 changes: 5 additions & 4 deletions GameData/MOARdV/Patches/000_JSI-To-MAS.cfg
Original file line number Diff line number Diff line change
@@ -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
{
Expand All @@ -23,7 +24,7 @@
}
}

@PART[JSIPrimitiveExternalCamera]:LAST[zzz_AvionicsSystems]
@PART[JSIPrimitiveExternalCamera]:FOR[AvionicsSystems]
{
MODULE
{
Expand All @@ -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 ===--- //

Expand Down
3 changes: 2 additions & 1 deletion GameData/MOARdV/Patches/001_ASET-To-MAS.nocfg
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
Original file line number Diff line number Diff line change
@@ -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],*
Expand Down
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
4 changes: 2 additions & 2 deletions GameData/MOARdV/Patches/MAS_AJE_IdEngine.cfg
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
File renamed without changes.

0 comments on commit 61b7ae3

Please sign in to comment.