Triggers fix (#1474)

* triggers fix * a few more characters --------- Co-authored-by: Grekopithikos <[email protected]> Co-authored-by: Edmund <[email protected]>
Warcraft-GoA-Development-Team · Oct 24, 2024 · 3709088 · 3709088
1 parent f995d4d
commit 3709088
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 27 deletions.
diff --git a/gfx/portraits/portrait_modifiers/04_headgear_armor.txt b/gfx/portraits/portrait_modifiers/04_headgear_armor.txt
@@ -1197,24 +1197,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
@@ -272,15 +272,23 @@
 			}
 			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_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
+				}
 			}
 		}