From c0eaadaec70042e33b233f84ba3fc4e0eea2c9aa Mon Sep 17 00:00:00 2001 From: sibir Date: Mon, 15 Jul 2024 16:07:36 -0700 Subject: [PATCH] Update `patchIncluded` messages [R] * Correct conditions with multiple patches in condition. * Introduced in # 1647 & # 2267. [R] --- masterlist.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/masterlist.yaml b/masterlist.yaml index 13b52a975..88d2b5d89 100644 --- a/masterlist.yaml +++ b/masterlist.yaml @@ -29585,7 +29585,7 @@ plugins: condition: 'active("Cutting Room Floor.esp") and not active("UltimateCollege_CRF_Patch.esp")' - <<: *patchIncluded subs: [ 'Diversity - A Character Overhaul' ] - condition: 'active("Diversity - A Character Overhaul.esp") and (not active("UltimateCollege_Diversity_Patch.esp") or not active("UltimateCollege_Diversity_CRF_VanillaHair.esp"))' + condition: 'active("Diversity - A Character Overhaul.esp") and not active("UltimateCollege_Diversity_(CRF_VanillaHair|Patch)\.esp")' - <<: *patchIncluded subs: [ 'Dynamic Firewood Stacks' ] condition: 'active("Dynamic Firewood Stacks.esp") and not active("UltimateCollege_DynFwS_Patch.esp")' @@ -29672,7 +29672,7 @@ plugins: condition: 'active("Snazzy Furniture and Clutter Overhaul.esp") and not active("UltimateCollege_SFCO_Patch.esp")' - <<: *patchIncluded subs: [ 'Solitude and Temple Frescoes' ] - condition: 'active("SolitudeTempleFrescoes.esp") and (not active("UltimateCollege_Frescoes_Patch.esp") or not active("UltimateCollege_Frescoes19ESL_Patch.esp") or not active("UltimateCollege_Frescoes19NLESL_Patch.esp"))' + condition: 'active("SolitudeTempleFrescoes.esp") and not active("UltimateCollege_Frescoes(19(NL)?ESL)?_Patch\.esp")' - <<: *patchIncluded subs: [ 'The Tools of Kagrenac' ] condition: 'active("Tools of Kagrenac.esp") and not active("UltimateCollege_ToK_Patch.esp")'