From 848c23b86ca5eb0974f203de53941d6c76e35a3e Mon Sep 17 00:00:00 2001
From: MacSplody <1944639+MacSplody@users.noreply.github.com>
Date: Wed, 31 Jul 2024 13:45:28 +0100
Subject: [PATCH] Update Better Cities (#1879)

* Update requirement
- Add version check for Open Better Cities.
- Removed in BC v6.2.0.

* Move files
- To old version files section.

* Remove metadata
- Load after rules handled by group.
- Data for old version files.
---
 masterlist.yaml | 104 +++++++++++++++---------------------------------
 1 file changed, 33 insertions(+), 71 deletions(-)

diff --git a/masterlist.yaml b/masterlist.yaml
index c13471c75..e17b97f14 100644
--- a/masterlist.yaml
+++ b/masterlist.yaml
@@ -24144,28 +24144,9 @@ plugins:
   - name: 'Better Cities .esp'
     group: *veryEarlyGroup
     after: [ 'DLCShiveringIsles.esp' ]
-  - name: 'Better Cities - Open Cities Reborn.esp'
-    group: *citiesGroup
-    after:
-      - 'Slof''s Oblivion Goth Shop.esp'
-      - name: 'TR_Stirk.esp'
-        condition: 'not active("Stirk_Compatibility_Patch.esp")'
-    tag: [ C.Regions ]
-    msg:
-      - <<: *patchIncluded
-        subs: [ 'Open Cities Reborn Blood&Mud Additions' ]
-        condition: 'active("Open Cities Reborn B&M Additions.esp") and not file("Better Cities - Open Cities Reborn B&M Compatibility.esp")'
-    clean:
-      - crc: 0xF0DD7E0D
-        util: 'TES4Edit v4.0.3h (Hotfix 1)'
   - name: 'Better Cities Full.esp'
     group: *citiesGroup
     after:
-      - '00RBScribeSupplies Intensive.esp'
-      - 'ClocksOfCyrodiil.esp'
-      - 'Slof''s Oblivion Goth Shop.esp'
-      - name: 'TR_Stirk.esp'
-        condition: 'not active("Stirk_Compatibility_Patch.esp")'
       # Afters for group, may not be required if main OC plugins are required.
       - 'Open Cities Bartholm.esp'
       - 'Open Cities New Sheoth.esp'
@@ -24207,17 +24188,10 @@ plugins:
   - name: 'Better Cities (BRUMA|LEYAWIIN)\.esp'
     after: [ 'Better Cities CHEYDINHAL.esp' ]
   - name: 'Better Cities ANVIL.esp'
-    after:
-      - 'ClocksOfCyrodiil.esp'
-      - name: 'TR_Stirk.esp'
-        condition: 'not active("Stirk_Compatibility_Patch.esp")'
     clean:
       - crc: 0xE391D0D4
         util: 'TES4Edit v4.0.3h (Hotfix 1)'
   - name: 'Better Cities BRAVIL.esp'
-    after:
-      - '00RBScribeSupplies Intensive.esp'
-      - 'ClocksOfCyrodiil.esp'
     tag: [ C.Water ]
     msg:
       - <<: *includesX
@@ -24227,35 +24201,25 @@ plugins:
       - crc: 0x32CC5DAE
         util: 'TES4Edit v4.0.3h (Hotfix 1)'
   - name: 'Better Cities BRUMA.esp'
-    after:
-      - 'Better Cities LEYAWIIN.esp'
-      - 'ClocksOfCyrodiil.esp'
+    after: [ 'Better Cities LEYAWIIN.esp' ]
     clean:
       - crc: 0x5B75A4D5
         util: 'TES4Edit v4.0.3h (Hotfix 1)'
   - name: 'Better Cities CHEYDINHAL.esp'
-    after: [ 'ClocksOfCyrodiil.esp' ]
     clean:
       - crc: 0x80CE0E51
         util: 'TES4Edit v4.0.3h (Hotfix 1)'
   - name: 'Better Cities CHORROL.esp'
-    after:
-      - 'ClocksOfCyrodiil.esp'
-      - 'Slof''s Oblivion Goth Shop.esp'
     dirty:
       - <<: *quickClean
         crc: 0x566A0E20
         util: '[TES4Edit v4.0.3h (Hotfix 1)](https://www.nexusmods.com/oblivion/mods/11536)'
         itm: 1
   - name: 'Better Cities LEYAWIIN.esp'
-    after: [ 'ClocksOfCyrodiil.esp' ]
     clean:
       - crc: 0xA3A5BB46
         util: 'TES4Edit v4.0.3h (Hotfix 1)'
   - name: 'Better Cities SKINGRAD.esp'
-    after:
-      - 'ClocksOfCyrodiil.esp'
-      - 'Cyrodiil Rebuild.esp'
     dirty:
       - <<: *quickClean
         crc: 0x45E44430
@@ -24263,12 +24227,7 @@ plugins:
         itm: 29
   - name: 'Better Imperial City.esp'
     group: *imperialCityGroup
-    after:
-      - 'Better Cities - IC Imperial Isle.esp'
-      - 'ClocksOfCyrodiil.esp'
-      - 'ICEXPAND.esp'
-      - 'Sounds of Cyrodiil.esp'
-      - 'The Mystery of the Dulan Cult.esp'
+    after: [ 'Better Cities - IC Imperial Isle.esp' ]
     inc: [ 'Open Cities Outer Districts.esp' ]
     clean:
       - crc: 0xBA85C1FF
@@ -24368,33 +24327,6 @@ plugins:
     clean:
       - crc: 0x9766EE6B
         util: 'TES4Edit v4.0.3h (Hotfix 1)'
-  - name: 'Better Cities - Leyawiin Flooded.esp'
-    after: [ 'Better Cities Full.esp' ]
-    req:
-      - name: 'Better Cities LEYAWIIN.esp'
-        display: 'Better Cities Full.esp or Better Cities LEYAWIIN.esp'
-        condition: 'not file("Better Cities Full.esp")'
-    clean:
-      - crc: 0x57D7201B
-        util: 'TES4Edit v4.0.3h (Hotfix 1)'
-  - name: 'Better Cities - Open Better Cities.esp'
-    after:
-      - 'Better Cities ANVIL.esp'
-      - 'Better Cities BRAVIL.esp'
-      - 'Better Cities BRUMA.esp'
-      - 'Better Cities CHEYDINHAL.esp'
-      - 'Better Cities CHORROL.esp'
-      - 'Better Cities LEYAWIIN.esp'
-      - 'Better Cities SKINGRAD.esp'
-    req:
-      - name: 'Better Cities Full.esp'
-        display: 'Better Cities Full or Separate City ESPs'
-        condition: 'not file("Better Cities (ANVIL|BRAVIL|BRUMA|CHEYDINHAL|CHORROL|LEYAWIIN|SKINGRAD)\.esp")'
-    clean:
-      - crc: 0x5C553011
-        util: 'TES4Edit v4.0.3h (Hotfix 1)'
-  - name: 'Better Cities - Open Cities Reborn B&M Compatibility.esp'
-    req: [ 'Better Cities - Open Cities Reborn.esp' ]
   - name: 'Better Imperial City FPS Patch.esp'
     clean:
       - crc: 0x596DF446
@@ -24518,7 +24450,9 @@ plugins:
       - name: 'Better Cities ANVIL.esp'
         display: 'Better Cities Full.esp or Better Cities ANVIL.esp'
         condition: 'not file("Better Cities Full.esp")'
-      - 'Better Cities - Open Better Cities.esp'
+      - name: 'Better Cities - Open Better Cities.esp'
+        display: 'Better Cities - Open Better Cities.esp'
+        condition: 'version("Better Cities Resources.esm", "6.2.0", <)'
   - name: 'Better Cities Chorrol - Knights of the Nine.esp'
     after: [ 'Better Cities Full.esp' ]
     req:
@@ -24755,8 +24689,36 @@ plugins:
         display: 'Better Imperial City.esp or Better Cities IC Arena.esp'
         condition: 'not file("Better Imperial City.esp")'
   ### Better Cities - Old version files ###
+  - name: 'Better Cities - Leyawiin Flooded.esp'
+    after: [ 'Better Cities Full.esp' ]
+    req:
+      - name: 'Better Cities LEYAWIIN.esp'
+        display: 'Better Cities Full.esp or Better Cities LEYAWIIN.esp'
+        condition: 'not file("Better Cities Full.esp")'
   - name: 'Better Cities - Knights of the Nine.esp'
     req: [ 'Better Cities - Open Better Cities.esp' ]
+  - name: 'Better Cities - Open Better Cities.esp'
+    after:
+      - 'Better Cities ANVIL.esp'
+      - 'Better Cities BRAVIL.esp'
+      - 'Better Cities BRUMA.esp'
+      - 'Better Cities CHEYDINHAL.esp'
+      - 'Better Cities CHORROL.esp'
+      - 'Better Cities LEYAWIIN.esp'
+      - 'Better Cities SKINGRAD.esp'
+    req:
+      - name: 'Better Cities Full.esp'
+        display: 'Better Cities Full or Separate City ESPs'
+        condition: 'not file("Better Cities (ANVIL|BRAVIL|BRUMA|CHEYDINHAL|CHORROL|LEYAWIIN|SKINGRAD)\.esp")'
+  - name: 'Better Cities - Open Cities Reborn.esp'
+    group: *citiesGroup
+    tag: [ C.Regions ]
+    msg:
+      - <<: *patchIncluded
+        subs: [ 'Open Cities Reborn Blood&Mud Additions' ]
+        condition: 'active("Open Cities Reborn B&M Additions.esp") and not file("Better Cities - Open Cities Reborn B&M Compatibility.esp")'
+  - name: 'Better Cities - Open Cities Reborn B&M Compatibility.esp'
+    req: [ 'Better Cities - Open Cities Reborn.esp' ]
 
   ### Better Cities - 3RD Party Patches ###
   - name: 'BC Skingrad Reduced - [DE]V\.esp'