Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Triggers fix #1474

Merged
merged 3 commits into from
Oct 24, 2024
Merged

Triggers fix #1474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7006313
triggers fix
Chomski2 Sep 23, 2024
27015e0
a few more characters
Grekopithikos Sep 23, 2024
80f92e7
Merge branch 'dev' into fix/3D/triggers
edmund-h Oct 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 20 additions & 18 deletions gfx/portraits/portrait_modifiers/04_headgear_armor.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
}
}
Expand Down
26 changes: 17 additions & 9 deletions gfx/portraits/portrait_modifiers/05_headgear_situational.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,15 +252,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
}
}
}

Expand Down