diff --git a/common/character_interactions/00_religious_interactions.txt b/common/character_interactions/00_religious_interactions.txt index 53cbf125c..a437f036b 100644 --- a/common/character_interactions/00_religious_interactions.txt +++ b/common/character_interactions/00_religious_interactions.txt @@ -9400,7 +9400,12 @@ debug_force_next_realm_priest_interaction = { is_shown = { debug_only = yes scope:puppet_or_actor ?= { - religion = religion:christianity_religion + OR = { + religion = religion:protestant_religion + religion = religion:catholic_religion + religion = religion:eastern_orthodox_religion + religion = religion:oriental_orthodox_religion + } } } diff --git a/common/customizable_localization/00_divinity_custom_loc.txt b/common/customizable_localization/00_divinity_custom_loc.txt index 517967d29..f5695e230 100644 --- a/common/customizable_localization/00_divinity_custom_loc.txt +++ b/common/customizable_localization/00_divinity_custom_loc.txt @@ -3783,7 +3783,16 @@ GetReligiousRite = { text = { localization_key = rite_mass - trigger = { faith = { religion = religion:christianity_religion } } + trigger = { + faith = { + OR = { + religion = religion:protestant_religion + religion = religion:catholic_religion + religion = religion:eastern_orthodox_religion + religion = religion:oriental_orthodox_religion + } + } + } } text = { localization_key = rite_prayer diff --git a/common/customizable_localization/00_food_custom_loc.txt b/common/customizable_localization/00_food_custom_loc.txt index 5b1631da1..4d3cd3de3 100644 --- a/common/customizable_localization/00_food_custom_loc.txt +++ b/common/customizable_localization/00_food_custom_loc.txt @@ -2649,7 +2649,12 @@ GetExpensiveMealAlt = { # Medieval Christian tables treated porpoise as Lenten "fish" trigger = { faith = { - religion_tag = christianity_religion + OR = { + religion_tag = protestant_religion + religion_tag = catholic_religion + religion_tag = eastern_orthodox_religion + religion_tag = oriental_orthodox_religion + } } location = { OR = { diff --git a/common/customizable_localization/05_bp2_custom_loc.txt b/common/customizable_localization/05_bp2_custom_loc.txt index 4b95191de..5cc0e3ddf 100644 --- a/common/customizable_localization/05_bp2_custom_loc.txt +++ b/common/customizable_localization/05_bp2_custom_loc.txt @@ -180,7 +180,14 @@ EruditeTopic = { localization_key = debating_mythological_characters } text = { - trigger = { faith.religion = religion:christianity_religion } + trigger = { + OR = { + faith.religion = religion:protestant_religion + faith.religion = religion:catholic_religion + faith.religion = religion:eastern_orthodox_religion + faith.religion = religion:oriental_orthodox_religion + } + } localization_key = geometrical_shapes } } diff --git a/common/decisions/00_artifact_decisions.txt b/common/decisions/00_artifact_decisions.txt index b951c97aa..6a49c52a9 100644 --- a/common/decisions/00_artifact_decisions.txt +++ b/common/decisions/00_artifact_decisions.txt @@ -250,7 +250,12 @@ commission_artifact_decision = { value = commission_religious is_shown = { has_pam_dlc_trigger = yes - religion = religion:christianity_religion + OR = { + religion = religion:protestant_religion + religion = religion:catholic_religion + religion = religion:eastern_orthodox_religion + religion = religion:oriental_orthodox_religion + } } is_valid = { custom_tooltip = { diff --git a/common/flavorization/20_pam_flavorization.txt b/common/flavorization/20_pam_flavorization.txt index 7dad612fe..1a05438fc 100644 --- a/common/flavorization/20_pam_flavorization.txt +++ b/common/flavorization/20_pam_flavorization.txt @@ -33,7 +33,7 @@ clerical_region_duchy_fallback = { priority = 30 governments = { ecclesiastical_government } - religions = { christianity_religion eastern_orthodox_religion oriental_orthodox_religion catholic_religion protestant_religion } + religions = { eastern_orthodox_religion oriental_orthodox_religion catholic_religion protestant_religion } flavourization_rules = { target_character = yes diff --git a/common/religion/doctrine_types/20_doctrines.txt b/common/religion/doctrine_types/20_doctrines.txt index 903a2a3a1..f924706ec 100644 --- a/common/religion/doctrine_types/20_doctrines.txt +++ b/common/religion/doctrine_types/20_doctrines.txt @@ -2093,7 +2093,6 @@ doctrine_monasticism_encouraged = { triggered_desc = { trigger = { OR = { - religion_tag = christianity_religion religion_tag = catholic_religion religion_tag = eastern_orthodox_religion religion_tag = oriental_orthodox_religion @@ -2106,7 +2105,6 @@ doctrine_monasticism_encouraged = { triggered_desc = { trigger = { OR = { - religion_tag = christianity_religion religion_tag = catholic_religion religion_tag = eastern_orthodox_religion religion_tag = oriental_orthodox_religion @@ -2119,7 +2117,6 @@ doctrine_monasticism_encouraged = { triggered_desc = { trigger = { OR = { - religion_tag = christianity_religion religion_tag = catholic_religion religion_tag = eastern_orthodox_religion religion_tag = oriental_orthodox_religion @@ -2141,7 +2138,6 @@ doctrine_monasticism_encouraged = { limit = { OR = { OR = { - rite_religion_tag = christianity_religion rite_religion_tag = catholic_religion rite_religion_tag = eastern_orthodox_religion rite_religion_tag = oriental_orthodox_religion @@ -2343,7 +2339,6 @@ doctrine_sacraments_central = { triggered_desc = { trigger = { OR = { - religion_tag = christianity_religion religion_tag = catholic_religion religion_tag = eastern_orthodox_religion religion_tag = oriental_orthodox_religion @@ -2356,7 +2351,6 @@ doctrine_sacraments_central = { triggered_desc = { trigger = { OR = { - religion_tag = christianity_religion religion_tag = catholic_religion religion_tag = eastern_orthodox_religion religion_tag = oriental_orthodox_religion @@ -2375,7 +2369,6 @@ doctrine_sacraments_central = { limit = { OR = { OR = { - rite_religion_tag = christianity_religion rite_religion_tag = catholic_religion rite_religion_tag = eastern_orthodox_religion rite_religion_tag = oriental_orthodox_religion diff --git a/common/religion/rite_icons/00_rite_icons.txt b/common/religion/rite_icons/00_rite_icons.txt index b797a1a2a..5550814b1 100644 --- a/common/religion/rite_icons/00_rite_icons.txt +++ b/common/religion/rite_icons/00_rite_icons.txt @@ -31,7 +31,6 @@ norse_christian_rite = { } } OR = { - scope:faith.religion = religion:christianity_religion scope:faith.religion = religion:catholic_religion scope:faith.religion = religion:eastern_orthodox_religion scope:faith.religion = religion:oriental_orthodox_religion @@ -58,7 +57,6 @@ celtic_christian_rite = { } } OR = { - scope:faith.religion = religion:christianity_religion scope:faith.religion = religion:catholic_religion scope:faith.religion = religion:eastern_orthodox_religion scope:faith.religion = religion:oriental_orthodox_religion @@ -87,7 +85,6 @@ early_british_christian_rite = { } } OR = { - scope:faith.religion = religion:christianity_religion scope:faith.religion = religion:catholic_religion scope:faith.religion = religion:eastern_orthodox_religion scope:faith.religion = religion:oriental_orthodox_religion @@ -106,7 +103,6 @@ british_christian_rite = { geographical_region = world_europe_west_britannia } OR = { - scope:faith.religion = religion:christianity_religion scope:faith.religion = religion:catholic_religion scope:faith.religion = religion:eastern_orthodox_religion scope:faith.religion = religion:oriental_orthodox_religion @@ -130,7 +126,6 @@ seafarer_christian_rite = { } } OR = { - scope:faith.religion = religion:christianity_religion scope:faith.religion = religion:catholic_religion scope:faith.religion = religion:eastern_orthodox_religion scope:faith.religion = religion:oriental_orthodox_religion @@ -147,7 +142,6 @@ hard_work_christian_rite = { trigger = { exists = scope:founder OR = { - scope:faith.religion = religion:christianity_religion scope:faith.religion = religion:catholic_religion scope:faith.religion = religion:eastern_orthodox_religion scope:faith.religion = religion:oriental_orthodox_religion @@ -166,7 +160,6 @@ poverty_pacifist_christian_rite = { exists = scope:founder scope:faith = { OR = { - religion = religion:christianity_religion religion = religion:catholic_religion religion = religion:eastern_orthodox_religion religion = religion:oriental_orthodox_religion @@ -190,7 +183,6 @@ esoteric_christian_rite = { exists = scope:founder scope:faith = { OR = { - religion = religion:christianity_religion religion = religion:catholic_religion religion = religion:eastern_orthodox_religion religion = religion:oriental_orthodox_religion @@ -209,7 +201,6 @@ holy_myron_christian_rite = { trigger = { exists = scope:founder OR = { - scope:faith.religion = religion:christianity_religion scope:faith.religion = religion:catholic_religion scope:faith.religion = religion:eastern_orthodox_religion scope:faith.religion = religion:oriental_orthodox_religion @@ -227,7 +218,6 @@ transsubstantiation_christian_rite = { trigger = { exists = scope:founder OR = { - scope:faith.religion = religion:christianity_religion scope:faith.religion = religion:catholic_religion scope:faith.religion = religion:eastern_orthodox_religion scope:faith.religion = religion:oriental_orthodox_religion @@ -245,7 +235,6 @@ mortification_of_the_flesh_christian_rite = { trigger = { exists = scope:founder OR = { - scope:faith.religion = religion:christianity_religion scope:faith.religion = religion:catholic_religion scope:faith.religion = religion:eastern_orthodox_religion scope:faith.religion = religion:oriental_orthodox_religion @@ -263,7 +252,6 @@ celestial_hierarchy_christian_rite = { trigger = { exists = scope:founder OR = { - scope:faith.religion = religion:christianity_religion scope:faith.religion = religion:catholic_religion scope:faith.religion = religion:eastern_orthodox_religion scope:faith.religion = religion:oriental_orthodox_religion @@ -281,7 +269,6 @@ purgatory_christian_rite = { trigger = { exists = scope:founder OR = { - scope:faith.religion = religion:christianity_religion scope:faith.religion = religion:catholic_religion scope:faith.religion = religion:eastern_orthodox_religion scope:faith.religion = religion:oriental_orthodox_religion @@ -301,7 +288,6 @@ german_christian_rite = { has_cultural_pillar = heritage_central_germanic } OR = { - scope:faith.religion = religion:christianity_religion scope:faith.religion = religion:catholic_religion scope:faith.religion = religion:eastern_orthodox_religion scope:faith.religion = religion:oriental_orthodox_religion @@ -329,7 +315,6 @@ occitan_christian_rite = { } } OR = { - scope:faith.religion = religion:christianity_religion scope:faith.religion = religion:catholic_religion scope:faith.religion = religion:eastern_orthodox_religion scope:faith.religion = religion:oriental_orthodox_religion @@ -354,7 +339,6 @@ latin_christian_rite = { } } OR = { - scope:faith.religion = religion:christianity_religion scope:faith.religion = religion:catholic_religion scope:faith.religion = religion:eastern_orthodox_religion scope:faith.religion = religion:oriental_orthodox_religion @@ -380,7 +364,6 @@ caucasian_syriac_east_african_christian_rite = { } } OR = { - scope:faith.religion = religion:christianity_religion scope:faith.religion = religion:catholic_religion scope:faith.religion = religion:eastern_orthodox_religion scope:faith.religion = religion:oriental_orthodox_religion @@ -406,7 +389,6 @@ byzantine_christian_rite = { } } OR = { - scope:faith.religion = religion:christianity_religion scope:faith.religion = religion:catholic_religion scope:faith.religion = religion:eastern_orthodox_religion scope:faith.religion = religion:oriental_orthodox_religion @@ -432,7 +414,6 @@ asia_christian_rite = { } } OR = { - scope:faith.religion = religion:christianity_religion scope:faith.religion = religion:catholic_religion scope:faith.religion = religion:eastern_orthodox_religion scope:faith.religion = religion:oriental_orthodox_religion @@ -454,7 +435,6 @@ near_east_middle_east_africa_christian_rite = { } } OR = { - scope:faith.religion = religion:christianity_religion scope:faith.religion = religion:catholic_religion scope:faith.religion = religion:eastern_orthodox_religion scope:faith.religion = religion:oriental_orthodox_religion @@ -471,7 +451,6 @@ regional_christian_rite = { trigger = { exists = scope:founder OR = { - scope:faith.religion = religion:christianity_religion scope:faith.religion = religion:catholic_religion scope:faith.religion = religion:eastern_orthodox_religion scope:faith.religion = religion:oriental_orthodox_religion diff --git a/common/religion/rite_names/00_rite_names.txt b/common/religion/rite_names/00_rite_names.txt index 701db2880..666084118 100644 --- a/common/religion/rite_names/00_rite_names.txt +++ b/common/religion/rite_names/00_rite_names.txt @@ -23,7 +23,6 @@ culture_head_founder_christian_rite = { trigger = { OR = { - scope:faith.religion = religion:christianity_religion scope:faith.religion = religion:catholic_religion scope:faith.religion = religion:eastern_orthodox_religion scope:faith.religion = religion:oriental_orthodox_religion @@ -62,7 +61,6 @@ landless_founder_christian_rite_ian = { trigger = { OR = { - scope:faith.religion = religion:christianity_religion scope:faith.religion = religion:catholic_religion scope:faith.religion = religion:eastern_orthodox_religion scope:faith.religion = religion:oriental_orthodox_religion @@ -93,7 +91,6 @@ landless_founder_christian_rite_ist = { trigger = { OR = { - scope:faith.religion = religion:christianity_religion scope:faith.religion = religion:catholic_religion scope:faith.religion = religion:eastern_orthodox_religion scope:faith.religion = religion:oriental_orthodox_religion @@ -124,7 +121,6 @@ landless_founder_christian_rite_ite = { trigger = { OR = { - scope:faith.religion = religion:christianity_religion scope:faith.religion = religion:catholic_religion scope:faith.religion = religion:eastern_orthodox_religion scope:faith.religion = religion:oriental_orthodox_religion @@ -155,7 +151,6 @@ landless_founder_christian_rite = { trigger = { OR = { - scope:faith.religion = religion:christianity_religion scope:faith.religion = religion:catholic_religion scope:faith.religion = religion:eastern_orthodox_religion scope:faith.religion = religion:oriental_orthodox_religion @@ -182,7 +177,6 @@ kingdom_founder_christian_rite = { trigger = { OR = { - scope:faith.religion = religion:christianity_religion scope:faith.religion = religion:catholic_religion scope:faith.religion = religion:eastern_orthodox_religion scope:faith.religion = religion:oriental_orthodox_religion @@ -198,7 +192,6 @@ regional_christian_rite = { trigger = { exists = scope:founder OR = { - scope:faith.religion = religion:christianity_religion scope:faith.religion = religion:catholic_religion scope:faith.religion = religion:eastern_orthodox_religion scope:faith.religion = religion:oriental_orthodox_religion diff --git a/common/scripted_effects/01_ep1_court_artifact_creation_effects.txt b/common/scripted_effects/01_ep1_court_artifact_creation_effects.txt index ebe2b5ba6..f4bc0741c 100644 --- a/common/scripted_effects/01_ep1_court_artifact_creation_effects.txt +++ b/common/scripted_effects/01_ep1_court_artifact_creation_effects.txt @@ -6521,7 +6521,7 @@ create_artifact_pedestal_reliquary_christian_effect = { add_scaled_artifact_modifier_grandeur_small_effect = yes set_variable = { name = relic_religion - value = religion:christianity_religion + value = religion:catholic_religion } } } @@ -6784,7 +6784,14 @@ create_artifact_sculpture_religious_effect = { scope:owner = { random_list = { # To have different statue names 1 = { - trigger = { religion != religion:christianity_religion } + trigger = { + OR = { + religion != religion:protestant_religion + religion != religion:catholic_religion + religion != religion:eastern_orthodox_religion + religion != religion:oriental_orthodox_religion + } + } create_artifact = { name = artifact_sculpture_religious_highgod_name description = artifact_sculpture_religious_highgod_description @@ -6799,7 +6806,14 @@ create_artifact_sculpture_religious_effect = { } } 1 = { - trigger = { religion = religion:christianity_religion } + trigger = { + OR = { + religion = religion:protestant_religion + religion = religion:catholic_religion + religion = religion:eastern_orthodox_religion + religion = religion:oriental_orthodox_religion + } + } create_artifact = { name = artifact_sculpture_religious_mary_name description = artifact_sculpture_religious_mary_description diff --git a/common/scripted_effects/06_dlc_ce1_legend_effects.txt b/common/scripted_effects/06_dlc_ce1_legend_effects.txt index b6a7682a6..e687b4b66 100644 --- a/common/scripted_effects/06_dlc_ce1_legend_effects.txt +++ b/common/scripted_effects/06_dlc_ce1_legend_effects.txt @@ -1648,15 +1648,27 @@ get_appropriate_exotic_location = { } 999 = { # Kingdom of Prester John, must be a Christian who doesn't know about Copts trigger = { - religion = religion:christianity_religion + OR = { + religion = religion:protestant_religion + religion = religion:catholic_religion + religion = religion:eastern_orthodox_religion + religion = religion:oriental_orthodox_religion + } NOT = { any_character_to_title_neighboring_and_across_water_county = { - holder = { faith = faith:miaphysitism } + holder = { religion = religion:oriental_orthodox_religion } } } NOT = { # Prester John isn't exciting if Egypt is Christian title:k_egypt = { - holder ?= { religion = religion:christianity_religion } + holder ?= { + OR = { + religion = religion:protestant_religion + religion = religion:catholic_religion + religion = religion:eastern_orthodox_religion + religion = religion:oriental_orthodox_religion + } + } } } } @@ -1667,7 +1679,12 @@ get_appropriate_exotic_location = { } 999 = { # Albion, Christians in Jerusalem were way way into Arthurian myth trigger = { - religion = religion:christianity_religion + OR = { + religion = religion:protestant_religion + religion = religion:catholic_religion + religion = religion:eastern_orthodox_religion + religion = religion:oriental_orthodox_religion + } capital_county = { title_province = { geographical_region = world_middle_east } }