diff --git a/common/decisions/00_major_decisions_east_europe.txt b/common/decisions/00_major_decisions_east_europe.txt index 98f6ff67..9393e210 100644 --- a/common/decisions/00_major_decisions_east_europe.txt +++ b/common/decisions/00_major_decisions_east_europe.txt @@ -874,7 +874,7 @@ accuse_krstjani_of_heresy_decision = { exists = dynasty #Gotta be an ecumenical Christian... faith = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } has_doctrine = special_doctrine_ecumenical_christian } #... with an existing Head of Faith. diff --git a/common/epidemics/00_epidemics.txt b/common/epidemics/00_epidemics.txt index 60e982f6..ae8ab0f8 100644 --- a/common/epidemics/00_epidemics.txt +++ b/common/epidemics/00_epidemics.txt @@ -1592,7 +1592,7 @@ measles = { trigger = { outbreak_province = province:1787 outbreak_intensity = apocalyptic - outbreak_province.county.faith = { religion_tag = christianity_religion } + outbreak_province.county.faith = { OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } } desc = epidemic_saint_veronica_evil } diff --git a/common/landed_titles/germany.txt b/common/landed_titles/germany.txt index fc703c77..df8a7184 100644 --- a/common/landed_titles/germany.txt +++ b/common/landed_titles/germany.txt @@ -14,7 +14,7 @@ e_germany = { NOT = { faith = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } has_doctrine = doctrine_spiritual_head } } diff --git a/common/landed_titles/greece.txt b/common/landed_titles/greece.txt index 348b3b11..71c2dd3d 100644 --- a/common/landed_titles/greece.txt +++ b/common/landed_titles/greece.txt @@ -198,7 +198,7 @@ e_greece = { limit = { is_ai = yes } - faith = { religion_tag = christianity_religion } + faith = { OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } } } diff --git a/common/landed_titles/iberia.txt b/common/landed_titles/iberia.txt index 5725bf8d..81b8c7c6 100644 --- a/common/landed_titles/iberia.txt +++ b/common/landed_titles/iberia.txt @@ -507,7 +507,7 @@ e_iberia = { limit = { is_ai = yes } - faith = { religion_tag = christianity_religion } + faith = { OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } } } @@ -1374,7 +1374,7 @@ e_iberia = { limit = { is_ai = yes } - faith = { religion_tag = christianity_religion } + faith = { OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } } } @@ -2104,7 +2104,7 @@ e_iberia = { limit = { is_ai = yes } - faith = { religion_tag = christianity_religion } + faith = { OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } } } @@ -2321,7 +2321,7 @@ e_iberia = { limit = { is_ai = yes } - faith = { religion_tag = christianity_religion } + faith = { OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } } } @@ -2353,7 +2353,7 @@ e_iberia = { limit = { is_ai = yes } - faith = { religion_tag = christianity_religion } + faith = { OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } } } @@ -2632,7 +2632,7 @@ e_iberia = { limit = { is_ai = yes } - faith = { religion_tag = christianity_religion } + faith = { OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } } } diff --git a/common/landed_titles/italy.txt b/common/landed_titles/italy.txt index 8526a418..f38bcf4e 100644 --- a/common/landed_titles/italy.txt +++ b/common/landed_titles/italy.txt @@ -35,7 +35,7 @@ e_italy = { limit = { is_ai = yes } - faith = { religion_tag = christianity_religion } + faith = { OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } } } diff --git a/common/landed_titles/yugoslavia.txt b/common/landed_titles/yugoslavia.txt index 4d7496a1..130a3902 100644 --- a/common/landed_titles/yugoslavia.txt +++ b/common/landed_titles/yugoslavia.txt @@ -389,7 +389,7 @@ e_yugoslavia = { color = { 138 0 17 } } } - c_vodica = { + c_moslavina = { color = { 138 0 17 } b_sisak = { province = 3535 @@ -930,8 +930,6 @@ e_yugoslavia = { capital = c_vhrbosna # Visoki - #Titular: created by decision. - ai_primary_priority = { if = { limit = { @@ -949,69 +947,64 @@ e_yugoslavia = { add = @better_than_the_alternatives_score } } - d_bosna = { #AKA Upper Bosnia - color = { 194 115 115 } + d_bosnia = { #AKA Upper Bosnia + color = { 16 125 74 } capital = c_vhrbosna # Visoki c_rama = { - color = { 194 105 125 } + color = { 36 145 104 } #capital = 3527 # Visoki b_vranduk = { province = 3524 - color = { 194 115 115 } + color = { 36 145 104 } } b_visoki = { province = 3527 - color = { 194 115 115 } + color = { 36 145 104 } } b_bobovac = { province = 3525 - color = { 194 115 115 } - } - b_usora = { #Actually Doboj: Usora is a river. - province = 463 - - color = { 170 70 100 } - } + color = { 36 145 104 } + } } c_vhrbosna = { - color = { 150 105 125 } + color = { 16 125 74 } #capital = 3567 # Vhrbosna - Modern Sarajevo. Probably. b_vhrbosna = { province = 3567 - color = { 150 105 125 } + color = { 16 125 74 } } b_olovo= { province = 3564 - color = { 150 105 125 } + color = { 16 125 74 } } b_gorazde = { province = 3582 - color = { 105 100 30 } + color = { 16 125 74 } } b_obalj = { province = 3559 - color = { 195 70 125 } + color = { 16 125 74 } } b_hotca = { province = 3583 - color = { 105 100 30 } + color = { 16 125 74 } } } c_podrinje = { - color = { 105 100 30 } + color = { 16 105 84 } #capital = 3583 # Hotca @@ -1019,36 +1012,36 @@ e_yugoslavia = { b_srebrenica = { province = 3566 - color = { 150 105 125 } + color = { 16 105 84 } } b_rogatica = { province = 3568 - color = { 150 105 125 } + color = { 16 105 84 } } b_visegrad = { province = 3581 - color = { 105 100 30 } + color = { 16 105 84 } } b_bijeljina = { province = 3509 - color = { 170 80 125 } + color = { 16 105 84 } } b_zvornik = { province = 3511 - color = { 170 80 125 } + color = { 16 105 84 } } b_kuclat = { province = 3565 - color = { 150 105 125 } + color = { 16 105 84 } } } c_soli = { - color = { 170 80 125 } + color = { 16 75 74 } #capital = 3510 # Soli - Modern Tuzla @@ -1061,68 +1054,73 @@ e_yugoslavia = { b_soli = { province = 3510 - color = { 170 80 125 } + color = { 16 75 74 } } b_maglaj = { province = 3514 - color = { 170 70 100 } + color = { 16 75 74 } } b_srebrenik = { province = 3513 - color = { 170 70 100 } + color = { 16 75 74 } } } c_posavska = { - color = { 170 70 100 } + color = { 16 65 64 } b_tolisa = { province = 3512 - color = { 170 70 100 } + color = { 16 65 64 } } } } - d_lower_bosna = { - color = { 180 85 120 } + d_krajina = { + color = { 16 105 94 } capital = c_vrbas # Banja Luka c_vrbas = { - color = { 125 20 90 } + color = { 16 105 94 } #capital = 3516 # Banja Luka (though the name is anachronistic, there were various settlements on or near the site) b_banjaluka = { province = 3516 - color = { 125 20 90 } + color = { 16 105 94 } } b_glaz = { province = 3517 - color = { 125 20 90 } + color = { 16 105 94 } } b_greben = { province = 3505 - color = { 175 90 115 } + color = { 16 105 94 } } b_kotorvaros = { province = 3506 - color = { 175 90 115 } + color = { 16 105 94 } } - b_vodicevo = { + b_prijedor = { province = 3519 - color = { 138 0 17 } - } + color = { 16 105 94 } + } + b_usora = { #Actually Doboj: Usora is a river. + province = 463 + + color = { 16 105 94 } + } } - c_pset = { - color = { 135 55 65 } + c_bihac = { + color = { 16 115 104 } #capital = 3522 # Bihac @@ -1136,7 +1134,7 @@ e_yugoslavia = { color = { 135 55 65 } } - b_pset = { + b_drvar = { province = 3523 color = { 135 55 65 } @@ -1146,106 +1144,95 @@ e_yugoslavia = { color = { 175 90 115 } } - b_topusko = { + b_cazin = { province = 3538 color = { 90 40 60 } } } - c_donjikraji = { - color = { 175 90 115 } + c_pliva = { + color = { 16 125 134 } #capital = 3507 # Jajce b_travnik = { province = 3526 - color = { 194 115 115 } + color = { 16 125 134 } } b_jajce = { province = 3507 - color = { 175 90 115 } + color = { 16 125 134 } } - b_sokol = { + b_sipovo = { province = 3508 - color = { 175 90 115 } + color = { 16 125 134 } } } } - d_usora = { #Actually Zachlumia - color = { 170 70 100 } + d_herzegovina = { #Actually Zachlumia + color = { 16 125 90 } capital = c_zelengora # Mostar - cultural_names = { - name_list_serbian = cn_zahumlje - name_list_croatian = cn_zahumlje - name_list_bosnian = cn_zahumlje - } - - c_zachlumia = { - color = { 210 80 90 } + c_trebinje = { + color = { 16 125 90 } #capital = 466 # Blagaj - cultural_names = { - name_list_serbian = cn_zahumlje - name_list_croatian = cn_zahumlje - name_list_bosnian = cn_zahumlje - } b_trebinje = { province = 3572 - color = { 140 90 35 } + color = { 16 125 90 } } b_nevesinje = { province = 3561 - color = { 210 80 90 } + color = { 16 125 90 } } - b_kljuc = { + b_ljubinje = { province = 3563 - color = { 210 80 90 } + color = { 16 125 90 } } b_gacko = { province = 3560 - color = { 195 70 125 } + color = { 16 125 90 } } } - c_zelengora = { - color = { 195 70 125 } + c_neretva = { + color = { 16 75 70 } b_mostar = { province = 3558 - color = { 210 80 90 } + color = { 16 75 70 } } b_blagaj = { province = 466 - color = { 210 80 90 } + color = { 16 75 70 } } b_drijeva = { province = 3562 - color = { 210 80 90 } + color = { 16 75 70 } } b_konjic = { province = 3557 - color = { 195 70 125 } + color = { 16 75 70 } } b_prozor = { province = 504 - color = { 194 115 115 } + color = { 16 75 70 } } } - c_zavrsje = { - color = { 220 130 100 } + c_livno = { + color = { 16 60 65 } #capital = 3501 # Hlivno @@ -1259,22 +1246,22 @@ e_yugoslavia = { b_hlivno = { province = 3501 - color = { 220 130 100 } + color = { 16 60 65 } } b_glamoc = { province = 3500 - color = { 220 130 100 } + color = { 16 60 65 } } b_duvno = { province = 3502 - color = { 220 130 100 } + color = { 16 60 65 } } b_imotski = { province = 3503 - color = { 220 130 100 } + color = { 16 60 65 } } } } diff --git a/common/religion/doctrine_types/30_core_tenets.txt b/common/religion/doctrine_types/30_core_tenets.txt index b3512a32..8288cc30 100644 --- a/common/religion/doctrine_types/30_core_tenets.txt +++ b/common/religion/doctrine_types/30_core_tenets.txt @@ -1036,7 +1036,7 @@ if = { limit = { OR = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } religion_tag = judaism_religion } } @@ -1322,7 +1322,7 @@ if = { limit = { OR = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } religion_tag = judaism_religion religion_tag = islam_religion } @@ -1380,7 +1380,7 @@ first_valid = { triggered_desc = { trigger = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } desc = tenet_alexandrian_catechism_name } @@ -1392,7 +1392,7 @@ first_valid = { triggered_desc = { trigger = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } desc = tenet_alexandrian_catechism_desc } @@ -1402,7 +1402,7 @@ is_shown = { OR = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } religion_tag = islam_religion } } @@ -1428,7 +1428,7 @@ icon = core_tenet_armed_pilgrimages piety_cost = { if = { - limit = { religion_tag = christianity_religion } + limit = { OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } value = faith_tenet_cost_low } else = { @@ -1444,7 +1444,7 @@ is_shown = { OR = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } religion_tag = judaism_religion } } @@ -1487,7 +1487,7 @@ else_if = { limit = { OR = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } religion_tag = judaism_religion } } @@ -1592,7 +1592,7 @@ if = { limit = { OR = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } religion_tag = judaism_religion } } @@ -1647,7 +1647,7 @@ first_valid = { triggered_desc = { trigger = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } desc = tenet_consolamentum_name } @@ -1838,7 +1838,7 @@ if = { limit = { OR = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } religion_tag = dualism_religion religion_tag = buddhism_religion religion_tag = jainism_religion @@ -1891,7 +1891,7 @@ if = { limit = { OR = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } religion_tag = dualism_religion religion_tag = buddhism_religion religion_tag = jainism_religion @@ -1941,7 +1941,7 @@ if = { limit = { OR = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } religion_tag = dualism_religion religion_tag = buddhism_religion religion_tag = jainism_religion @@ -1993,7 +1993,7 @@ piety_cost = { if = { limit = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } religion_tag = taoism_religion } value = faith_tenet_cost_low @@ -2065,7 +2065,7 @@ first_valid = { triggered_desc = { trigger = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } desc = tenet_pentarchy_alternate_name } @@ -2077,7 +2077,7 @@ if = { limit = { OR = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } religion_tag = hinduism_religion religion_tag = zoroastrianism_religion } @@ -2187,7 +2187,7 @@ if = { limit = { OR = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } religion_tag = dualism_religion religion_tag = buddhism_religion religion_tag = jainism_religion @@ -2234,7 +2234,7 @@ icon = core_tenet_pastoral_isolation is_shown = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } can_pick = { custom_description = { @@ -2457,7 +2457,7 @@ if = { limit = { OR = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } religion_tag = islam_religion } } @@ -2512,7 +2512,7 @@ piety_cost = { if = { limit = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } value = faith_tenet_cost_high @@ -2716,7 +2716,7 @@ is_shown = { NOR = { AND = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } NOT = { this = faith:cathar } } religion_tag = judaism_religion @@ -2759,7 +2759,7 @@ if = { limit = { OR = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } religion_tag = hinduism_religion religion_tag = zoroastrianism_religion has_doctrine = pagan_hostility_doctrine @@ -2916,7 +2916,7 @@ if = { limit = { OR = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } religion_tag = dualism_religion } } @@ -2965,7 +2965,7 @@ } is_shown = { - NOT = { religion_tag = christianity_religion } + NOT = { OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } NOT = { has_doctrine = special_doctrine_jizya } } } @@ -2989,7 +2989,7 @@ else_if = { limit = { OR = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } religion_tag = dualism_religion religion_tag = buddhism_religion religion_tag = jainism_religion @@ -3361,7 +3361,7 @@ if = { limit = { OR = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } religion_tag = judaism_religion religion_tag = islam_religion } @@ -3403,7 +3403,7 @@ if = { limit = { OR = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } religion_tag = buddhism_religion religion_tag = jainism_religion } @@ -3526,7 +3526,7 @@ is_shown = { # No HumSac for Abrahamics: 'tis literally the religion-namer. NOR = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } religion_tag = judaism_religion religion_tag = islam_religion } @@ -3844,7 +3844,7 @@ is_shown = { NOR = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } religion_tag = islam_religion religion_tag = judaism_religion religion_tag = dualism_religion @@ -3925,7 +3925,7 @@ is_shown = { # No HumSac for Abrahamics: 'tis literally the religion-namer. NOR = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } religion_tag = judaism_religion religion_tag = islam_religion } @@ -4299,7 +4299,7 @@ } is_shown = { - NOT = { religion_tag = christianity_religion } + NOT = { OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } } can_pick = { custom_description = { @@ -4336,7 +4336,7 @@ if = { limit = { OR = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } religion_tag = dualism_religion } } @@ -4390,7 +4390,7 @@ limit = { OR = { religion_tag = judaism_religion - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } religion_tag = dualism_religion } } @@ -4449,7 +4449,7 @@ if = { limit = { OR = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } has_doctrine = pagan_hostility_doctrine } } @@ -4642,7 +4642,7 @@ else_if = { limit = { OR = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } has_doctrine = pagan_hostility_doctrine } } @@ -4740,7 +4740,7 @@ else_if = { limit = { OR = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } religion_tag = judaism_religion religion_tag = islam_religion religion_tag = buddhism_religion @@ -5034,7 +5034,7 @@ OR = { has_doctrine = tenet_mendicant_preachers has_doctrine = tenet_gnosticism - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } religion_tag = zoroastrianism_religion } } diff --git a/common/script_values/99_court_chaplain_values.txt b/common/script_values/99_court_chaplain_values.txt index b98edd77..c4d5b70d 100644 --- a/common/script_values/99_court_chaplain_values.txt +++ b/common/script_values/99_court_chaplain_values.txt @@ -727,7 +727,7 @@ court_chaplain_conversion_contextual_bonuses = { limit = { exists = scope:county scope:councillor.faith = { has_doctrine_parameter = christian_syncretic_actor_opinion_active } - scope:county.faith = { religion_tag = christianity_religion } + scope:county.faith = { OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } } add = { value = scope:councillor.conversion_syncretic_with_religion_malus diff --git a/common/scripted_triggers/00_clothing_triggers.txt b/common/scripted_triggers/00_clothing_triggers.txt index c94665e1..c6a4a914 100644 --- a/common/scripted_triggers/00_clothing_triggers.txt +++ b/common/scripted_triggers/00_clothing_triggers.txt @@ -2865,7 +2865,7 @@ portrait_iconoclast_high_trigger = { exists = this AND = { faith = { has_doctrine = tenet_aniconism } - faith = { religion_tag = christianity_religion } + faith = { OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } } OR = { has_character_flag = need_priest_outfit diff --git a/common/scripted_triggers/00_religious_triggers.txt b/common/scripted_triggers/00_religious_triggers.txt index 3f0d89f7..0c43e9f5 100644 --- a/common/scripted_triggers/00_religious_triggers.txt +++ b/common/scripted_triggers/00_religious_triggers.txt @@ -57,7 +57,7 @@ has_strong_religious_conviction_trigger = { } is_christian_trigger = { - faith = { religion_tag = christianity_religion } + faith = { OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } } # Not-non-XYZ triggers allow us to check for specific historical faiths whilst still defaulting to something positive for variant faiths. @@ -779,7 +779,7 @@ is_preferred_heresy = { OR = { #If we're Chistian, pick a heretical faiths which is in the same regional group as our origin faith (i.e., Lollards for Catholics, Iconoclasts for Orthodox, etc.) AND = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } OR = { faiths_are_in_western_christianity_group = { FAITH_1 = $ORIGIN_FAITH$ FAITH_2 = $HERETICAL_FAITH$ } faiths_are_in_orthodox_christianity_group = { FAITH_1 = $ORIGIN_FAITH$ FAITH_2 = $HERETICAL_FAITH$ } @@ -808,7 +808,7 @@ is_preferred_heresy = { #Otherwise, we don't have any special preferences. NOT = { religion_tag = islam_religion - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } religion_tag = zoroastrianism_religion } } @@ -830,7 +830,7 @@ is_valid_heresy = { OR = { #For Christian Faiths, the origin and heretical faiths must not both be Ecumenical (excepting the faiths which aren't technically ecumenical). AND = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } NAND = { $ORIGIN_FAITH$ = { has_doctrine = special_doctrine_ecumenical_christian @@ -1090,7 +1090,7 @@ refusing_conversion_is_crime_trigger = { always = no } OR = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } religion_tag = islam_religion religion_tag = judaism_religion religion_tag = zoroastrianism_religion diff --git a/common/traits/00_traits.txt b/common/traits/00_traits.txt index 0f820c56..78a1695b 100644 --- a/common/traits/00_traits.txt +++ b/common/traits/00_traits.txt @@ -8968,7 +8968,7 @@ faith_warrior = { desc = faith_warrior.dds } triggered_desc = { - trigger = { faith = { religion_tag = christianity_religion } } + trigger = { faith = { OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } } desc = crusader.dds } triggered_desc = { @@ -9085,7 +9085,7 @@ faith_warrior = { desc = trait_mujahid_character_desc } triggered_desc = { - trigger = { faith = { religion_tag = christianity_religion } } + trigger = { faith = { OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } } desc = trait_crusader_character_desc } desc = trait_faith_warrior_character_desc @@ -9109,7 +9109,7 @@ saint = { desc = trait_venerated_ancestor } triggered_desc = { - trigger = { faith = { religion_tag = christianity_religion } } + trigger = { faith = { OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } } desc = trait_saint } desc = trait_venerated_ancestor @@ -14013,13 +14013,13 @@ crusader_king = { } triggered_desc = { trigger = { - faith = { religion_tag = christianity_religion } + faith = { OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } is_female = yes } desc = trait_crusader_king_female } triggered_desc = { - trigger = { faith = { religion_tag = christianity_religion } } + trigger = { faith = { OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } } desc = trait_crusader_king } triggered_desc = { diff --git a/events/activities/pilgrimage_activity/pilgrimage_events.txt b/events/activities/pilgrimage_activity/pilgrimage_events.txt index 2adbc28b..5bd1317a 100644 --- a/events/activities/pilgrimage_activity/pilgrimage_events.txt +++ b/events/activities/pilgrimage_activity/pilgrimage_events.txt @@ -12997,7 +12997,7 @@ pilgrimage.6810 = { } cooldown = { years = 1 } trigger = { - faith = { religion_tag = christianity_religion } #this is basically a Christian thing + faith = { OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } #this is basically a Christian thing exists = faith.religious_head #you have a religious head faith.religious_head = { this != root #and it's not you diff --git a/events/activities/tour_activity/tour_travel_events.txt b/events/activities/tour_activity/tour_travel_events.txt index 05aac49c..158a1b33 100644 --- a/events/activities/tour_activity/tour_travel_events.txt +++ b/events/activities/tour_activity/tour_travel_events.txt @@ -664,7 +664,7 @@ tour_travel.1004 = { trigger = { is_location_valid_for_travel_event_on_land = yes has_activity_intent = altruism_intent - faith = { religion_tag = christianity_religion } + faith = { OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } is_governor = no } @@ -909,7 +909,7 @@ tour_travel.1005 = { trigger = { is_location_valid_for_travel_event_on_land = yes has_activity_intent = altruism_intent - faith = { religion_tag = christianity_religion } + faith = { OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } is_governor = no } diff --git a/events/decisions_events/iberia_north_africa_events.txt b/events/decisions_events/iberia_north_africa_events.txt index 5ded5411..da6ffd8d 100644 --- a/events/decisions_events/iberia_north_africa_events.txt +++ b/events/decisions_events/iberia_north_africa_events.txt @@ -47,7 +47,7 @@ iberia_north_africa.0001 = { #by Mathilda Bjarnehed triggered_desc = { trigger = { game_start_date >= 789.1.1 #The end of Umayyad Conquest - faith = { religion_tag = christianity_religion } + faith = { OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } } desc = iberia_north_africa.0001.christian.desc } @@ -459,14 +459,14 @@ iberia_north_africa.0016 = { #by Mathilda Bjarnehed text = iberia_north_africa.0015.a } name = { - trigger = { faith = { religion_tag = christianity_religion } } + trigger = { faith = { OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } } text = iberia_north_africa.0016.christianity.a } name = { trigger = { faith = { NOR = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } religion_tag = islam_religion } } diff --git a/events/dlc/ce1/epidemic_events.txt b/events/dlc/ce1/epidemic_events.txt index 4e81bc37..733373b7 100644 --- a/events/dlc/ce1/epidemic_events.txt +++ b/events/dlc/ce1/epidemic_events.txt @@ -7604,7 +7604,7 @@ epidemic_events.5900 = { text = epidemic_events.5900.christian trigger = { faith = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } } } @@ -7613,7 +7613,7 @@ epidemic_events.5900 = { trigger = { NOT = { faith = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } } } @@ -8585,7 +8585,7 @@ epidemic_events.5906 = { is_available_adult = yes is_landed = yes faith = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } exists = cp:councillor_marshal } @@ -9235,7 +9235,7 @@ epidemic_events.5999 = { name = { trigger = { faith = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } } @@ -9245,7 +9245,7 @@ epidemic_events.5999 = { trigger = { NOT = { faith = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } } } @@ -9311,7 +9311,7 @@ epidemic_events.6000 = { text = epidemic_events.5900.christian trigger = { faith = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } } } @@ -9320,7 +9320,7 @@ epidemic_events.6000 = { trigger = { NOT = { faith = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } } } diff --git a/events/dlc/ep3/ep3_laamp_flavor.txt b/events/dlc/ep3/ep3_laamp_flavor.txt index 3e16fda5..c286eac6 100644 --- a/events/dlc/ep3/ep3_laamp_flavor.txt +++ b/events/dlc/ep3/ep3_laamp_flavor.txt @@ -798,8 +798,8 @@ ep3_laamp_flavor.0050 = { has_government = landless_adventurer_government is_adult = yes is_available_allow_travelling = yes - faith = { religion_tag = christianity_religion } - location.faith = { religion_tag = christianity_religion } + faith = { OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } + location.faith = { OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } NOR = { has_trait = witch any_secret = { type = secret_witch } diff --git a/events/dlc/fp2/fp2_yearly_events.txt b/events/dlc/fp2/fp2_yearly_events.txt index 39b63ff9..915cc448 100644 --- a/events/dlc/fp2/fp2_yearly_events.txt +++ b/events/dlc/fp2/fp2_yearly_events.txt @@ -3056,7 +3056,7 @@ fp2_yearly.4006 = { #You are not Christian at all NOT = { - faith = { religion_tag = christianity_religion } + faith = { OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } } #and you have a county that has a free holding slot @@ -3272,7 +3272,7 @@ fp2_yearly.4007 = { exists = cp:councillor_court_chaplain #You are Christian - faith = { religion_tag = christianity_religion } + faith = { OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } #You can see sea shells on the sea shore NOT = { @@ -3937,7 +3937,7 @@ fp2_yearly.4010 = { name = fp2_yearly.4010.a trigger = { - faith = { religion_tag = christianity_religion } + faith = { OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } } duel = { diff --git a/events/lifestyles/scholarship_lifestyle/learning_theology_events.txt b/events/lifestyles/scholarship_lifestyle/learning_theology_events.txt index 5df5a5b8..3dbdf5df 100644 --- a/events/lifestyles/scholarship_lifestyle/learning_theology_events.txt +++ b/events/lifestyles/scholarship_lifestyle/learning_theology_events.txt @@ -34,7 +34,7 @@ learning_theology.1301 = { first_valid = { triggered_desc = { trigger = { - faith = { religion_tag = christianity_religion } + faith = { OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } } desc = learning_theology.1301.desc_regula_pastoralis } @@ -1144,7 +1144,7 @@ learning_theology.3021 = { triggered_desc = { trigger = { faith = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } } desc = learning_theology.3021.desc_christian @@ -3625,7 +3625,7 @@ learning_theology_special.1101 = { faith = { OR = { religion_tag = judaism_religion - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } religion_tag = dualism_religion religion_tag = islam_religion } diff --git a/events/yearly_events/court_yearly_events.txt b/events/yearly_events/court_yearly_events.txt index 3cfcdee8..9df00860 100644 --- a/events/yearly_events/court_yearly_events.txt +++ b/events/yearly_events/court_yearly_events.txt @@ -2962,7 +2962,7 @@ court_yearly.7030 = { scripted_trigger court_7040_ascetic_religion_trigger = { faith = { OR = { - religion_tag = christianity_religion + OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } religion_tag = buddhism_religion religion_tag = jainism_religion religion_tag = taoism_religion diff --git a/history/titles/k_serbia.txt b/history/titles/k_serbia.txt index 9d0c2541..cd25df3b 100644 --- a/history/titles/k_serbia.txt +++ b/history/titles/k_serbia.txt @@ -24,13 +24,13 @@ c_szerem = { } -d_bosna = { +d_bosnia = { 2554.1.1 = { holder = yugoslavia0002 } } -d_lower_bosna = { +d_krajina = { 2554.1.1 = { holder = yugoslavia0002 } diff --git a/holder for later/common/landed_titles/0.15_MAP.txt b/holder for later/common/landed_titles/0.15_MAP.txt index bb6a45fc..19186441 100644 --- a/holder for later/common/landed_titles/0.15_MAP.txt +++ b/holder for later/common/landed_titles/0.15_MAP.txt @@ -5394,7 +5394,7 @@ e_greece = { limit = { is_ai = yes } - faith = { religion_tag = christianity_religion } + faith = { OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } } } diff --git a/holder for later/common/landed_titles/greece.txt b/holder for later/common/landed_titles/greece.txt index 93bb06a5..9a1583f9 100644 --- a/holder for later/common/landed_titles/greece.txt +++ b/holder for later/common/landed_titles/greece.txt @@ -196,7 +196,7 @@ e_greece = { limit = { is_ai = yes } - faith = { religion_tag = christianity_religion } + faith = { OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } } } diff --git a/holder for later/common/landed_titles/middle_east.txt b/holder for later/common/landed_titles/middle_east.txt index 7cd81eb1..522c0860 100644 --- a/holder for later/common/landed_titles/middle_east.txt +++ b/holder for later/common/landed_titles/middle_east.txt @@ -1861,11 +1861,11 @@ e_arabia = { capital = c_jerusalem can_create = { - faith = { religion_tag = christianity_religion } + faith = { OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } } can_create_on_partition = { - faith = { religion_tag = christianity_religion } + faith = { OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } } ai_primary_priority = { diff --git a/localization/english/replace/titles_l_english.yml b/localization/english/replace/titles_l_english.yml index 309a2447..dc15b66a 100644 --- a/localization/english/replace/titles_l_english.yml +++ b/localization/english/replace/titles_l_english.yml @@ -15964,8 +15964,8 @@ d_bohemia:0 "Prague" d_bohemia_adj:0 "Praguer" d_bordeaux:0 "Bordeaux" - d_bosna:2 "Upper Bosnia" - d_bosna_adj:1 "Upper Bosnian" + d_bosna:2 "Bosnia" + d_bosna_adj:1 "Bosnian" d_bosnia:0 "Bosnia" d_bosnia_adj:0 "Bosnian" d_braganza:0 "Braganza" @@ -26321,9 +26321,17 @@ e_baltic_adj:0 "Baltic" ###Yugoslavia + k_montenegro:0 "Montenegro" + k_montenegro_adj:0 "Montenegrin" b_prekmurje:0 "Prekmurje" + c_moslavina:0 "Moslavina" + c_moslavina_adj:0 "Moslavinian" c_maribor:0 "Maribor" c_maribor_adj:0 "Mariborian" + d_krajina:0 "Krajina" + d_krajina_adj:0 "Krajinian" + d_herzegovina:0 "Herzegovina" + d_herzegovina_adj:0 "Herzegovina" ###Crimea d_sevastopol:0 "Sevastopol" diff --git a/map_data/provinces.png b/map_data/provinces.png index 95fc370d..f578016d 100644 --- a/map_data/provinces.png +++ b/map_data/provinces.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b02eb9d6ebdba614d6b9671163a896115a6f70526cc09e99a0af3d14ced60260 -size 2558247 +oid sha256:fab93b2a5579981911acd7386c2f4353c7f1ce033e4f25018f4b8e001c428c66 +size 2636914