From 700631352728d5e48986e267a8b0f5281a4f558e Mon Sep 17 00:00:00 2001 From: Chomski Date: Mon, 23 Sep 2024 17:26:35 +0200 Subject: [PATCH 1/2] triggers fix --- .../portrait_modifiers/04_headgear_armor.txt | 38 ++++++++++--------- .../05_headgear_situational.txt | 20 +++++----- 2 files changed, 31 insertions(+), 27 deletions(-) diff --git a/gfx/portraits/portrait_modifiers/04_headgear_armor.txt b/gfx/portraits/portrait_modifiers/04_headgear_armor.txt index caed3fb1d1..1c5fe4ff6f 100644 --- a/gfx/portraits/portrait_modifiers/04_headgear_armor.txt +++ b/gfx/portraits/portrait_modifiers/04_headgear_armor.txt @@ -1114,24 +1114,26 @@ } modifier = { factor = 0 - is_rexxar_trigger = yes - is_blackhand_trigger = yes - is_durotan_trigger = yes - is_thrall_trigger = yes - is_guldan_trigger = yes - is_garona_trigger = yes - is_orgrim_trigger = yes - is_kilrogg_trigger = yes - is_urukal_trigger = yes - is_dalrend_trigger = yes - is_maim_trigger = yes - is_griselda_trigger = yes - is_grommash_trigger = yes - is_garrosh_trigger = yes - is_drekthar_trigger = yes - is_draka_trigger = yes - is_nazgrel_trigger = yes - is_nerzhul_trigger = yes + OR = { + is_rexxar_trigger = yes + is_blackhand_trigger = yes + is_durotan_trigger = yes + is_thrall_trigger = yes + is_guldan_trigger = yes + is_garona_trigger = yes + is_orgrim_trigger = yes + is_kilrogg_trigger = yes + is_urukal_trigger = yes + is_dalrend_trigger = yes + is_maim_trigger = yes + is_griselda_trigger = yes + is_grommash_trigger = yes + is_garrosh_trigger = yes + is_drekthar_trigger = yes + is_draka_trigger = yes + is_nazgrel_trigger = yes + is_nerzhul_trigger = yes + } } } } diff --git a/gfx/portraits/portrait_modifiers/05_headgear_situational.txt b/gfx/portraits/portrait_modifiers/05_headgear_situational.txt index c62f010ec1..a62daa9837 100644 --- a/gfx/portraits/portrait_modifiers/05_headgear_situational.txt +++ b/gfx/portraits/portrait_modifiers/05_headgear_situational.txt @@ -252,15 +252,17 @@ } modifier = { factor = 0 - culture ?= { has_cultural_pillar = heritage_highborne } - is_uther_trigger = yes - is_arthas_trigger = yes - is_calia_trigger = yes - is_kelthuzad_trigger = yes - is_godfrey_trigger = yes - is_jandice_trigger = yes - is_alexi_trigger = yes - is_sally_whitemane_trigger = yes + OR = { + culture ?= { has_cultural_pillar = heritage_highborne } + is_uther_trigger = yes + is_arthas_trigger = yes + is_calia_trigger = yes + is_kelthuzad_trigger = yes + is_godfrey_trigger = yes + is_jandice_trigger = yes + is_alexi_trigger = yes + is_sally_whitemane_trigger = yes + } } } From 27015e057f72523abaec822247313d79ee937f22 Mon Sep 17 00:00:00 2001 From: Grekopithikos <70974452+Grekopithikos@users.noreply.github.com> Date: Mon, 23 Sep 2024 23:27:17 +0300 Subject: [PATCH 2/2] a few more characters --- .../portrait_modifiers/05_headgear_situational.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gfx/portraits/portrait_modifiers/05_headgear_situational.txt b/gfx/portraits/portrait_modifiers/05_headgear_situational.txt index a62daa9837..7d81c2763d 100644 --- a/gfx/portraits/portrait_modifiers/05_headgear_situational.txt +++ b/gfx/portraits/portrait_modifiers/05_headgear_situational.txt @@ -261,7 +261,13 @@ is_godfrey_trigger = yes is_jandice_trigger = yes is_alexi_trigger = yes + is_alexei_trigger = yes + is_illucia_trigger = yes is_sally_whitemane_trigger = yes + is_thoras_trigger = yes + is_galen_trigger = yes + is_derek_proudmoore_trigger = yes + is_nazgrim_trigger = yes } } }