diff --git a/common/scripted_triggers/NEOW_religion_triggers.txt b/common/scripted_triggers/NEOW_religion_triggers.txt index 3c6dcdd0..c22a0019 100644 --- a/common/scripted_triggers/NEOW_religion_triggers.txt +++ b/common/scripted_triggers/NEOW_religion_triggers.txt @@ -1,6 +1,31 @@ -NEOW_is_catholic_or_catholic_adjacent_trigger = { +NEOW_religion_is_broadly_christian_trigger = { + OR = { + NEOW_is_broadly_catholic_trigger = yes + NEOW_is_broadly_protestant_trigger = yes + NEOW_is_broadly_orthodox_trigger = yes + } +} + +NEOW_is_broadly_catholic_trigger = { OR = { faith = faith:orleaniste religion = religion:catholic_religion } +} + +NEOW_is_broadly_protestant_trigger = { + OR = { + faith = faith:aslanite + religion = religion:protestant_religion + } +} +NEOW_is_broadly_orthodox_trigger = { + religion = religion:eastern_orthodox_religion +} + +NEOW_is_broadly_muslim_trigger = { + OR = { + faith = faith:simurghi + religion = religion:islam_religion + } } \ No newline at end of file diff --git a/events/activities/hold_court_activity/hold_court_events_general.txt b/events/activities/hold_court_activity/hold_court_events_general.txt index d958591e..91b71072 100644 --- a/events/activities/hold_court_activity/hold_court_events_general.txt +++ b/events/activities/hold_court_activity/hold_court_events_general.txt @@ -13067,7 +13067,7 @@ hold_court.8020 = { } hidden_effect = { if = { - limit = { OR = { religion = religion:eastern_orthodox_religion religion = religion:catholic_religion religion = religion:protestant_religion } } + limit = { NEOW_religion_is_broadly_christian_trigger = yes } create_artifact_pedestal_reliquary_christian_effect = { OWNER = scope:bishop } } else_if = { diff --git a/events/activities/pilgrimage_activity/pilgrimage_events.txt b/events/activities/pilgrimage_activity/pilgrimage_events.txt index 41eeb9fc..02fa6494 100644 --- a/events/activities/pilgrimage_activity/pilgrimage_events.txt +++ b/events/activities/pilgrimage_activity/pilgrimage_events.txt @@ -11874,13 +11874,13 @@ pilgrimage.6770 = { first_valid = { triggered_desc = { trigger = { - OR = { religion = religion:eastern_orthodox_religion religion = religion:catholic_religion religion = religion:protestant_religion } + NEOW_religion_is_broadly_christian_trigger = yes } desc = pilgrimage.6770.desc.christian } triggered_desc = { trigger = { - religion = religion:islam_religion + NEOW_is_broadly_muslim_trigger = yes } desc = pilgrimage.6770.desc.islam } @@ -11943,11 +11943,11 @@ pilgrimage.6770 = { } hidden_effect_new_object = { if = { - limit = { OR = { religion = religion:eastern_orthodox_religion religion = religion:catholic_religion religion = religion:protestant_religion } } + limit = { NEOW_religion_is_broadly_christian_trigger = yes } create_artifact_pedestal_reliquary_christian_effect = { OWNER = scope:relic_merchant } } else_if = { - limit = { religion = religion:islam_religion } + limit = { NEOW_is_broadly_muslim_trigger = yes } create_artifact_pedestal_reliquary_islam_effect = { OWNER = scope:relic_merchant } } else_if = { diff --git a/events/scheme_events/mandala_schemes/disbelieve_mandala_scheme_events.txt b/events/scheme_events/mandala_schemes/disbelieve_mandala_scheme_events.txt index aed823d4..699b80e8 100644 --- a/events/scheme_events/mandala_schemes/disbelieve_mandala_scheme_events.txt +++ b/events/scheme_events/mandala_schemes/disbelieve_mandala_scheme_events.txt @@ -203,7 +203,7 @@ disbelieve_mandala_ongoing.0010 = { save_scope_as = spymaster hidden_effect = { if = { - limit = { OR = { religion = religion:eastern_orthodox_religion religion = religion:catholic_religion religion = religion:protestant_religion } } + limit = { NEOW_religion_is_broadly_christian_trigger = yes } create_artifact_pedestal_reliquary_christian_effect = { OWNER = scope:spymaster } } else_if = {