From 3147e9bffb6f5202262b3471e771c580c06807d1 Mon Sep 17 00:00:00 2001
From: sibir <ine.sibir@gmail.com>
Date: Fri, 13 Oct 2023 22:50:29 -0700
Subject: [PATCH] Update Modular PatchXPress (MPxP) (#2867)

* Add load afters
  * Non-TGCoS version should load after requried [1.1] & [1.2] plugins.
  * Checksum isn't required, messages will ensure users use the right
    plugins.

* Add incompatibility
  * TGCoS-incompatible version of [2.0] SSkwy plugin added in v1.0.7.
  * Non-TGCoS version v1.0.8: 0xAF71B5A8.

* Update `requiresX` message
  * TGCoS requirement shouldn't be displayed for non-TGCoS version.
  * TGCoS version v1.0.8: 0x8A10F7E6.

* Add `requiresX` message
  * Non-TGCoS version requires non-TGCoS [1.1] or [1.2] plugin.
---
 masterlist.yaml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/masterlist.yaml b/masterlist.yaml
index 52dabc972..038b90856 100644
--- a/masterlist.yaml
+++ b/masterlist.yaml
@@ -28727,19 +28727,28 @@ plugins:
   # [2.0] Personal Creations #
   - name: 'SSkwy Estuary Fortress Extension.esp'
     after:
+      - 'MPXP1.1 [PATCH - DBPT.SSkwy].esp'
       - 'MPXP1.1 [PATCH - DBPT.SSkwy.TGCoS].esp'
       - 'MPXP1.1 [PATCH - SSkwy.TGCoS].esp'
+      - 'MPXP1.2 [PATCH - DBPT.SSkwy] (OCS).esp'
       - 'MPXP1.2 [PATCH - DBPT.SSkwy.TGCoS] (OCS).esp'
       - 'MPXP1.2 [PATCH - SSkwy.TGCoS] (OCS).esp'
       - 'MPXP1.3 [PATCH - DBPT.SSkwy.LotD].esp'
       - 'MPXP1.3 [PATCH - DBPT.SSkwy.LotD] (OCS).esp'
       - 'MPXP1.3 [PATCH - SSkwy.LotD].esp'
       - 'MPXP1.3 [PATCH - SSkwy.LotD] (OCS).esp'
+    inc:
+      - name: 'The Great City of Solitude.esp'
+        condition: 'checksum("SSkwy Estuary Fortress Extension.esp", AF71B5A8)'
     msg:
       - <<: *requiresX
         type: error
         subs: [ 'MPXP 1.1 **OR** 1.2 TGCoS ESP' ]
-        condition: 'not active("MPXP1\.[12] \[PATCH - (DBPT\.)?SSkwy\.TGCoS\]( \(OCS\))?\.esp")'
+        condition: 'checksum("SSkwy Estuary Fortress Extension.esp", 8A10F7E6) and not active("MPXP1\.[12] \[PATCH - (DBPT\.)?SSkwy\.TGCoS\]( \(OCS\))?\.esp")'
+      - <<: *requiresX
+        type: error
+        subs: [ '**MPXP1.1 [PATCH - DBPT.SSkwy].esp** **OR** **MPXP1.2 [PATCH - DBPT.SSkwy] (OCS).esp**' ]
+        condition: 'checksum("SSkwy Estuary Fortress Extension.esp", AF71B5A8) and not active("MPXP1\.[12] \[PATCH - DBPT\.SSkwy\]( \(OCS\))?\.esp")'
   - name: 'SSkwy Estuary Fortress Extension [PATCH - RBS].esp'
     msg:
       - <<: *requiresX