From 65e53348c7407911459d26281e9538b793283e17 Mon Sep 17 00:00:00 2001 From: sibir Date: Fri, 26 Jul 2024 01:38:51 -0700 Subject: [PATCH 1/7] Add plugin * To 'Official Mods' section. --- masterlist.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/masterlist.yaml b/masterlist.yaml index 6126e88..a8a153f 100644 --- a/masterlist.yaml +++ b/masterlist.yaml @@ -276,6 +276,8 @@ plugins: subs: [ 'Unofficial Morrowind Official Plugins Patched' ] condition: 'active("Unofficial Morrowind Official Plugins Patched.ESP")' + - name: '(Adamantium Armor|Area Effect Arrows|Helm of Tohan|Master Index|Siege at Firemoth) Naturalized\.esp' + - name: '(adamantiumarmor|\[Official\]Adamantium Armor)\.esp' after: - 'AreaEffectArrows.esp' From dd3502e7c24287eaecf5a04759e68220692d5695 Mon Sep 17 00:00:00 2001 From: sibir Date: Fri, 26 Jul 2024 01:39:19 -0700 Subject: [PATCH 2/7] Add location * https://www.nexusmods.com/morrowind/mods/51107 --- masterlist.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/masterlist.yaml b/masterlist.yaml index a8a153f..07ae215 100644 --- a/masterlist.yaml +++ b/masterlist.yaml @@ -277,6 +277,9 @@ plugins: condition: 'active("Unofficial Morrowind Official Plugins Patched.ESP")' - name: '(Adamantium Armor|Area Effect Arrows|Helm of Tohan|Master Index|Siege at Firemoth) Naturalized\.esp' + url: + - link: 'https://www.nexusmods.com/morrowind/mods/51107/' + name: 'Bethesda Official Plugins Naturalized' - name: '(adamantiumarmor|\[Official\]Adamantium Armor)\.esp' after: From 35caffab391cc3b895b488635af118cca17f3861 Mon Sep 17 00:00:00 2001 From: sibir Date: Fri, 26 Jul 2024 01:40:03 -0700 Subject: [PATCH 3/7] Assign 'Early Loaders' group * Sort along w/ other official mod plugins. --- masterlist.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/masterlist.yaml b/masterlist.yaml index 07ae215..a884a05 100644 --- a/masterlist.yaml +++ b/masterlist.yaml @@ -280,6 +280,7 @@ plugins: url: - link: 'https://www.nexusmods.com/morrowind/mods/51107/' name: 'Bethesda Official Plugins Naturalized' + group: *earlyLoadersGroup - name: '(adamantiumarmor|\[Official\]Adamantium Armor)\.esp' after: From f8d5d8bafc03f7d36ce34a8d2afbeb8ddfd31c37 Mon Sep 17 00:00:00 2001 From: sibir Date: Fri, 26 Jul 2024 01:43:12 -0700 Subject: [PATCH 4/7] Add incompat. * Use w/ merged plugin causes duplication of placed references. --- masterlist.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/masterlist.yaml b/masterlist.yaml index a884a05..b71f0cd 100644 --- a/masterlist.yaml +++ b/masterlist.yaml @@ -281,6 +281,7 @@ plugins: - link: 'https://www.nexusmods.com/morrowind/mods/51107/' name: 'Bethesda Official Plugins Naturalized' group: *earlyLoadersGroup + inc: [ 'Unofficial Morrowind Official Plugins Patched.ESP' ] - name: '(adamantiumarmor|\[Official\]Adamantium Armor)\.esp' after: From 0c81d04db4caa2db12934d558ce52940fd8a0a04 Mon Sep 17 00:00:00 2001 From: sibir Date: Fri, 26 Jul 2024 01:45:20 -0700 Subject: [PATCH 5/7] Update names * Add Naturalized plugins to appropriate names. --- masterlist.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/masterlist.yaml b/masterlist.yaml index b71f0cd..cae5525 100644 --- a/masterlist.yaml +++ b/masterlist.yaml @@ -283,7 +283,7 @@ plugins: group: *earlyLoadersGroup inc: [ 'Unofficial Morrowind Official Plugins Patched.ESP' ] - - name: '(adamantiumarmor|\[Official\]Adamantium Armor)\.esp' + - name: '(adamantiumarmor|(\[Official\])?Adamantium Armor( Naturalized)?)\.esp' after: - 'AreaEffectArrows.esp' - 'bcsounds.esp' @@ -302,7 +302,7 @@ plugins: subs: [ '"Adamantium Armor"' ] condition: 'many("(adamantiumarmor|\[Official\]Adamantium Armor)\.esp")' - - name: '(AreaEffectArrows|\[Official\]Area Effect Arrows)\.esp' + - name: '(AreaEffectArrows|(\[Official\])?Area Effect Arrows( Naturalized)?)\.esp' after: - 'bcsounds.esp' - 'entertainers.esp' @@ -322,7 +322,7 @@ plugins: subs: [ '"Bitter Coast Sounds"' ] condition: 'many("(bcsounds|\[Official\]Bitter Coast Sounds)\.esp")' - - name: '(EBQ_Artifact|\[Official\]Helm of Tohan)\.esp' + - name: '(EBQ_Artifact|(\[Official\])?Helm of Tohan( Naturalized)?)\.esp' after: - 'AreaEffectArrows.esp' - 'bcsounds.esp' @@ -362,7 +362,7 @@ plugins: subs: [ '"LeFemm Armor"' ] condition: 'many("(LeFemmArmor|\[Official\]LeFemm Armor)\.esp")' - - name: '(master_index|\[Official\]Master Index)\.esp' + - name: '(master_index|(\[Official\])?Master Index( Naturalized)?)\.esp' after: - 'AreaEffectArrows.esp' - 'bcsounds.esp' @@ -377,7 +377,7 @@ plugins: subs: [ '"Master Index"' ] condition: 'many("(master_index|\[Official\]Master Index)\.esp")' - - name: '(Siege at Firemoth|\[Official\]Siege at Firemoth)\.esp' + - name: '(\[Official\])?Siege at Firemoth( Naturalized)?\.esp' after: - 'adamantiumarmor.esp' - 'AreaEffectArrows.esp' From ef9f0322d48683fb4c4e466eda0e76a4c4d94a3d Mon Sep 17 00:00:00 2001 From: sibir Date: Fri, 26 Jul 2024 01:47:00 -0700 Subject: [PATCH 6/7] Add load afters * Sort Naturalized plugins w/ rest of official mods. --- masterlist.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/masterlist.yaml b/masterlist.yaml index cae5525..7f43168 100644 --- a/masterlist.yaml +++ b/masterlist.yaml @@ -297,6 +297,9 @@ plugins: - '[Official]Helm of Tohan.esp' - '[Official]LeFemm Armor.esp' - '[Official]Master Index.esp' + - 'Area Effect Arrows Naturalized.esp' + - 'Helm of Tohan Naturalized.esp' + - 'Master Index Naturalized.esp' msg: - <<: *useOnlyOneX subs: [ '"Adamantium Armor"' ] @@ -330,6 +333,7 @@ plugins: - '[Official]Area Effect Arrows.esp' - '[Official]Bitter Coast Sounds.esp' - '[Official]Entertainers.esp' + - 'Area Effect Arrows Naturalized.esp' msg: - <<: *useOnlyOneX subs: [ '"EBQ_Artifact" or "Helm of Tohan"' ] @@ -357,6 +361,9 @@ plugins: - '[Official]Entertainers.esp' - '[Official]Helm of Tohan.esp' - '[Official]Master Index.esp' + - 'Area Effect Arrows Naturalized.esp' + - 'Helm of Tohan Naturalized.esp' + - 'Master Index Naturalized.esp' msg: - <<: *useOnlyOneX subs: [ '"LeFemm Armor"' ] @@ -372,6 +379,8 @@ plugins: - '[Official]Bitter Coast Sounds.esp' - '[Official]Entertainers.esp' - '[Official]Helm of Tohan.esp' + - 'Area Effect Arrows Naturalized.esp' + - 'Helm of Tohan Naturalized.esp' msg: - <<: *useOnlyOneX subs: [ '"Master Index"' ] @@ -393,6 +402,10 @@ plugins: - '[Official]Helm of Tohan.esp' - '[Official]LeFemm Armor.esp' - '[Official]Master Index.esp' + - 'Adamantium Armor Naturalized.esp' + - 'Area Effect Arrows Naturalized.esp' + - 'Helm of Tohan Naturalized.esp' + - 'Master Index Naturalized.esp' msg: - <<: *useOnlyOneX subs: [ '"Siege at Firemoth"' ] From 2fbcad7f4bac7e07437d770f7a4969a6df8b2c01 Mon Sep 17 00:00:00 2001 From: sibir Date: Fri, 26 Jul 2024 01:48:10 -0700 Subject: [PATCH 7/7] Update `useOnlyOneX` messages * Naturalized plugins shouldn't be used w/ alt. versions of same mod. --- masterlist.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/masterlist.yaml b/masterlist.yaml index 7f43168..3c08fb0 100644 --- a/masterlist.yaml +++ b/masterlist.yaml @@ -303,7 +303,7 @@ plugins: msg: - <<: *useOnlyOneX subs: [ '"Adamantium Armor"' ] - condition: 'many("(adamantiumarmor|\[Official\]Adamantium Armor)\.esp")' + condition: 'many("(adamantiumarmor|(\[Official\])?Adamantium Armor( Naturalized)?)\.esp")' - name: '(AreaEffectArrows|(\[Official\])?Area Effect Arrows( Naturalized)?)\.esp' after: @@ -314,7 +314,7 @@ plugins: msg: - <<: *useOnlyOneX subs: [ '"Area Effect Arrows"' ] - condition: 'many("(AreaEffectArrows|\[Official\]Area Effect Arrows)\.esp")' + condition: 'many("(AreaEffectArrows|(\[Official\])?Area Effect Arrows( Naturalized)?)\.esp")' - name: '(bcsounds|\[Official\]Bitter Coast Sounds)\.esp' after: @@ -337,7 +337,7 @@ plugins: msg: - <<: *useOnlyOneX subs: [ '"EBQ_Artifact" or "Helm of Tohan"' ] - condition: 'many("(EBQ_Artifact|\[Official\]Helm of Tohan)\.esp")' + condition: 'many("(EBQ_Artifact|(\[Official\])?Helm of Tohan( Naturalized)?)\.esp")' - name: '(entertainers|\[Official\]Entertainers)\.esp' msg: @@ -384,7 +384,7 @@ plugins: msg: - <<: *useOnlyOneX subs: [ '"Master Index"' ] - condition: 'many("(master_index|\[Official\]Master Index)\.esp")' + condition: 'many("(master_index|(\[Official\])?Master Index( Naturalized)?)\.esp")' - name: '(\[Official\])?Siege at Firemoth( Naturalized)?\.esp' after: @@ -409,7 +409,7 @@ plugins: msg: - <<: *useOnlyOneX subs: [ '"Siege at Firemoth"' ] - condition: 'many("(Siege at Firemoth|\[Official\]Siege at Firemoth)\.esp")' + condition: 'many("(\[Official\])?Siege at Firemoth( Naturalized)?\.esp")' - name: 'Unofficial Morrowind Official Plugins Patched.ESP' url: [ 'https://www.nexusmods.com/morrowind/mods/43931/' ]