diff --git a/common/character_interactions/00_religious_interactions.txt b/common/character_interactions/00_religious_interactions.txt index acb63c596..514dc2b07 100644 --- a/common/character_interactions/00_religious_interactions.txt +++ b/common/character_interactions/00_religious_interactions.txt @@ -1,4 +1,4 @@ -# Interaction used to convert people when you reform or create a faith +# Interaction used to convert people when you reform or create a faith ask_for_conversion_interaction = { category = interaction_category_religion special_interaction = request_conversion_interaction @@ -2450,7 +2450,7 @@ declaration_of_repentance_interaction = { has_trait = excommunicated faith = { religious_head = scope:recipient - has_doctrine = tenet_communion + has_doctrine_parameter = excommunication_active } } } @@ -2663,7 +2663,7 @@ excommunicate_interaction = { scope:actor = scope:actor.faith.religious_head scope:actor.faith = { this = scope:recipient.faith - has_doctrine = tenet_communion + has_doctrine_parameter = excommunication_active has_doctrine = doctrine_spiritual_head } @@ -2946,7 +2946,7 @@ request_excommunication_interaction = { scope:actor.faith = { exists = religious_head this = scope:secondary_recipient.faith - has_doctrine = tenet_communion + has_doctrine_parameter = excommunication_active has_doctrine = doctrine_spiritual_head } } diff --git a/common/culture/name_lists/NEOW_rusyn.txt b/common/culture/name_lists/NEOW_rusyn.txt index 59a87a9bc..22265a899 100644 --- a/common/culture/name_lists/NEOW_rusyn.txt +++ b/common/culture/name_lists/NEOW_rusyn.txt @@ -309,8 +309,6 @@ Zuzana } - patronym_suffix_male = "dynnpat_suf_ov_i_hat__c_crn_" - patronym_suffix_female = "dynnpat_suf_ovna" dynasty_of_location_prefix = "dynnp_of" diff --git a/common/decisions/major_decisions_NEOW.txt b/common/decisions/major_decisions_NEOW.txt index 27ab14ce4..f44071481 100644 --- a/common/decisions/major_decisions_NEOW.txt +++ b/common/decisions/major_decisions_NEOW.txt @@ -1081,7 +1081,6 @@ albanian_two_decision = { is_shown = { is_ruler = yes is_playable_character = yes - has_title = title:k_epirus culture = { has_cultural_pillar = heritage_albanian } title:k_two_albania = { is_titular = yes } } diff --git a/common/decisions/religious_decisions_NEOW.txt b/common/decisions/religious_decisions_NEOW.txt index 1105a6fd7..2b46b9f66 100644 --- a/common/decisions/religious_decisions_NEOW.txt +++ b/common/decisions/religious_decisions_NEOW.txt @@ -379,6 +379,14 @@ is_shown = { restore_patriarch_scripted_effect = yes + title:k_orthodox = { + set_variable = { + name = ecumenical_patriarchate_restored + value = yes + } + } + + add_prestige = 500 add_piety = 1000 add_legitimacy = 50 diff --git a/common/landed_titles/greece.txt b/common/landed_titles/greece.txt index 87cfbe464..ba27bbbe5 100644 --- a/common/landed_titles/greece.txt +++ b/common/landed_titles/greece.txt @@ -193,6 +193,12 @@ e_greece = { "Kyprianós" } + holding_regnal_female_names = { + "Kýpria" + "Kyprianí" + "Kinýra" + } + cultural_names = { name_list_turkish = cn_kibris } diff --git a/common/landed_titles/religious_titles.txt b/common/landed_titles/religious_titles.txt index eb61d44a1..a560b8df5 100644 --- a/common/landed_titles/religious_titles.txt +++ b/common/landed_titles/religious_titles.txt @@ -146,6 +146,7 @@ k_orthodox = { K_a_act_llistos K_a_act_rolos K_o_act_non + Kle_o_act_pas K_y_act_rillos K_y_act_ros Kall_i_act_nikos diff --git a/common/religion/doctrine_types/NEOW_virtue_doctrines.txt b/common/religion/doctrine_types/NEOW_virtue_doctrines.txt index 1c1107c92..a8d7d51bd 100644 --- a/common/religion/doctrine_types/NEOW_virtue_doctrines.txt +++ b/common/religion/doctrine_types/NEOW_virtue_doctrines.txt @@ -135,6 +135,10 @@ special_doctrine_horned_lords_law = { } special_doctrine_hesychastic_virtue = { + parameters = { + excommunication_active = yes + } + traits = { virtues = { diligent = 2 patient = 2 zealous = 2 humble = 2 honest = 2 } sins = { lazy = 2 cynical = 2 deceitful = 2 arrogant = 2 } diff --git a/common/scripted_effects/NEOW_religion_effects.txt b/common/scripted_effects/NEOW_religion_effects.txt index cc1cd23e0..60abefb8c 100644 --- a/common/scripted_effects/NEOW_religion_effects.txt +++ b/common/scripted_effects/NEOW_religion_effects.txt @@ -1,52 +1,54 @@ -NEOW_set_bhakti_effect = { #reminder: patron gods will not remove on conversion until a specific base game event is replaced/overwritten. This folder is being created, rather than overwriting a base game folder to reduce overall complexity/troubleshooting +NEOW_set_bhakti_effect = { #reminder: patron gods will not remove on conversion until a specific base game event is replaced/overwritten. This folder is being created, rather than overwriting a base game folder to reduce overall complexity/troubleshooting # Remove any previous personal god relation. + ## Britannic - #Leviathan + # Leviathan if = { limit = { portrait_religious_faith_or_foundational_trigger = { FAITH = faith:leviathan } } - if = { + + if = { limit = { has_character_modifier = bhakti_leviathan_nationalisators } remove_character_modifier = bhakti_leviathan_nationalisators add_piety = massive_piety_loss } - else_if = { + else_if = { limit = { has_character_modifier = bhakti_leviathan_technosaurs } remove_character_modifier = bhakti_leviathan_technosaurs add_piety = massive_piety_loss } - else_if = { + else_if = { limit = { has_character_modifier = bhakti_leviathan_mechasaurs } remove_character_modifier = bhakti_leviathan_mechasaurs add_piety = massive_piety_loss } - else_if = { + else_if = { limit = { has_character_modifier = bhakti_leviathan_petrosaurs } remove_character_modifier = bhakti_leviathan_petrosaurs add_piety = massive_piety_loss } - else_if = { + else_if = { limit = { has_character_modifier = bhakti_leviathan_metallurgicals } remove_character_modifier = bhakti_leviathan_metallurgicals add_piety = massive_piety_loss } - else_if = { + else_if = { limit = { has_character_modifier = bhakti_leviathan_nautiluses } remove_character_modifier = bhakti_leviathan_nautiluses add_piety = massive_piety_loss } - else_if = { + else_if = { limit = { has_character_modifier = bhakti_leviathan_aerosaurs } @@ -54,7 +56,121 @@ add_piety = massive_piety_loss } } - # Put other religions/modifiers down here + + ## Folketero + else_if = { + limit = { + OR = { + has_character_modifier = bhakti_folketero_jesus + has_character_modifier = bhakti_folketero_per + has_character_modifier = bhakti_folketero_lucia + has_character_modifier = bhakti_folketero_olaf + } + } + + if = { + limit = { + has_character_modifier = bhakti_folketero_jesus + } + remove_character_modifier = bhakti_folketero_jesus + add_piety = massive_piety_loss + } + else_if = { + limit = { + has_character_modifier = bhakti_folketero_per + } + remove_character_modifier = bhakti_folketero_per + add_piety = massive_piety_loss + } + else_if = { + limit = { + has_character_modifier = bhakti_folketero_lucia + } + remove_character_modifier = bhakti_folketero_lucia + add_piety = massive_piety_loss + } + else_if = { + limit = { + has_character_modifier = bhakti_folketero_olaf + } + remove_character_modifier = bhakti_folketero_olaf + add_piety = massive_piety_loss + } + } + + ## Orthodox + else_if = { + limit = { + OR = { + has_character_modifier = bhakti_orthodox_paisos + has_character_modifier = bhakti_orthodox_gabriel + has_character_modifier = bhakti_orthodox_adriana + has_character_modifier = bhakti_orthodox_olga + has_character_modifier = bhakti_orthodox_palamas + has_character_modifier = bhakti_orthodox_surgeon + has_character_modifier = bhakti_orthodox_lazar + has_character_modifier = bhakti_orthodox_theotokos + } + } + + if = { + limit = { + has_character_modifier = bhakti_orthodox_paisos + } + remove_character_modifier = bhakti_orthodox_paisos + add_piety = massive_piety_loss + } + else_if = { + limit = { + has_character_modifier = bhakti_orthodox_gabriel + } + remove_character_modifier = bhakti_orthodox_gabriel + add_piety = massive_piety_loss + } + else_if = { + limit = { + has_character_modifier = bhakti_orthodox_adriana + } + remove_character_modifier = bhakti_orthodox_adriana + add_piety = massive_piety_loss + } + else_if = { + limit = { + has_character_modifier = bhakti_orthodox_olga + } + remove_character_modifier = bhakti_orthodox_olga + add_piety = massive_piety_loss + } + else_if = { + limit = { + has_character_modifier = bhakti_orthodox_palamas + } + remove_character_modifier = bhakti_orthodox_palamas + add_piety = massive_piety_loss + } + else_if = { + limit = { + has_character_modifier = bhakti_orthodox_surgeon + } + remove_character_modifier = bhakti_orthodox_surgeon + add_piety = massive_piety_loss + } + else_if = { + limit = { + has_character_modifier = bhakti_orthodox_lazar + } + remove_character_modifier = bhakti_orthodox_lazar + add_piety = massive_piety_loss + } + else_if = { + limit = { + has_character_modifier = bhakti_orthodox_theotokos + } + remove_character_modifier = bhakti_orthodox_theotokos + add_piety = massive_piety_loss + } + } + else = { # If no current bhakti, cost is reduced. add_piety = medium_piety_loss @@ -62,6 +178,7 @@ add_character_modifier = $BHAKTI$ } + # i dont know where else to put this restore_patriarch_scripted_effect = { root.faith = { diff --git a/common/scripted_triggers/NEOW_religion_triggers.txt b/common/scripted_triggers/NEOW_religion_triggers.txt index 49fb54119..5bea27598 100644 --- a/common/scripted_triggers/NEOW_religion_triggers.txt +++ b/common/scripted_triggers/NEOW_religion_triggers.txt @@ -33,7 +33,7 @@ NEOW_is_broadly_muslim_trigger = { NEOW_has_not_restored_ecumenical_patriarchate = { # forgive me i dont know where else to put this title:k_orthodox = { NOT = { - title_capital_county = title:c_byzantion + has_variable = ecumenical_patriarchate_restored } } } \ No newline at end of file diff --git a/history/characters/NEOW_ecumenical_patriarchs.txt b/history/characters/NEOW_ecumenical_patriarchs.txt index e32a710b3..5fc028913 100644 --- a/history/characters/NEOW_ecumenical_patriarchs.txt +++ b/history/characters/NEOW_ecumenical_patriarchs.txt @@ -7661,7 +7661,7 @@ custom_clothes=male_clothes_religious_orthodox_head_01_common } orthodoxpeps0007 = { # first romanian pat zealous but short lived - name="Ioan" + name="Constantin" religion="orthodox" culture=moldavian trait = education_learning_2 @@ -7683,7 +7683,7 @@ custom_clothes=male_clothes_religious_orthodox_head_01_common birth=yes } 2300.2.6={ - name="Ioánnis" + name="Kle_o_act_pas" } 2303.1.1={ death=yes diff --git a/history/characters/NEOW_western_eu_historical_figures.txt b/history/characters/NEOW_western_eu_historical_figures.txt index a1fd18c8d..a007b2978 100644 --- a/history/characters/NEOW_western_eu_historical_figures.txt +++ b/history/characters/NEOW_western_eu_historical_figures.txt @@ -962,7 +962,7 @@ historical_france0055 = { #post-event confusion, overthrown by Napoleon } } -historical_france_bonaparte0001 #dies historically earlier only for gameplay reasons, canonically lives longer +historical_france_bonaparte0001 = { #dies historically earlier only for gameplay reasons, canonically lives longer name="Napol_e_act_on" dynasty = bonaparte_dynasty religion = "roman_catholic" @@ -989,7 +989,7 @@ historical_france_bonaparte0001 #dies historically earlier only for gameplay rea } } -historical_france_bonaparte0002 #numbering +historical_france_bonaparte0002 = { #numbering name="Napoléon" dynasty = bonaparte_dynasty religion = "roman_catholic" @@ -1010,7 +1010,7 @@ historical_france_bonaparte0002 #numbering } } -historical_france_bonaparte0003 +historical_france_bonaparte0003 = { name="Napoléon" dynasty = bonaparte_dynasty religion = "roman_catholic" @@ -1036,7 +1036,7 @@ historical_france_bonaparte0003 ###_PORTUGAL_### -historical_portugal0001 +historical_portugal0001 = { name="Afonso" dynasty = borgonha_dynasty religion = "roman_catholic" @@ -1049,7 +1049,7 @@ historical_portugal0001 } } -historical_portugal0002 +historical_portugal0002 = { name="Sancho" dynasty = borgonha_dynasty religion = "roman_catholic" @@ -1063,7 +1063,7 @@ historical_portugal0002 } } -historical_portugal0003 +historical_portugal0003 = { name="Afonso" dynasty = borgonha_dynasty religion = "roman_catholic" @@ -1077,7 +1077,7 @@ historical_portugal0003 } } -historical_portugal0004 +historical_portugal0004 = { name="Sancho" dynasty = borgonha_dynasty religion = "roman_catholic" @@ -1091,7 +1091,7 @@ historical_portugal0004 } } -historical_portugal0005 +historical_portugal0005 = { name="Afonso" dynasty = borgonha_dynasty religion = "roman_catholic" @@ -1105,7 +1105,7 @@ historical_portugal0005 } } -historical_portugal0006 +historical_portugal0006 = { name="Dinis" dynasty = borgonha_dynasty religion = "roman_catholic" @@ -1119,7 +1119,7 @@ historical_portugal0006 } } -historical_portugal0007 +historical_portugal0007 = { name="Afonso" dynasty = borgonha_dynasty religion = "roman_catholic" @@ -1133,7 +1133,7 @@ historical_portugal0007 } } -historical_portugal0008 +historical_portugal0008 = { name="Pedro" dynasty = borgonha_dynasty religion = "roman_catholic" @@ -1147,7 +1147,7 @@ historical_portugal0008 } } -historical_portugal0009 +historical_portugal0009 = { name="Fernando" dynasty = borgonha_dynasty religion = "roman_catholic" @@ -1161,7 +1161,7 @@ historical_portugal0009 } } -historical_portugal0010 +historical_portugal0010 = { name="Beatriz" dynasty = borgonha_dynasty religion = "roman_catholic" @@ -1176,7 +1176,7 @@ historical_portugal0010 } } -historical_portugal0011 +historical_portugal0011 = { name="João" dynasty = avis_dynasty religion = "roman_catholic" @@ -1191,7 +1191,7 @@ historical_portugal0011 } } -historical_portugal0012 +historical_portugal0012 = { name="Duarte" dynasty = avis_dynasty religion = "roman_catholic" @@ -1205,7 +1205,7 @@ historical_portugal0012 } } -historical_portugal0013 +historical_portugal0013 = { name="Afonso" dynasty = avis_dynasty religion = "roman_catholic" @@ -1220,7 +1220,7 @@ historical_portugal0013 } } -historical_portugal0014 +historical_portugal0014 = { name="João" dynasty = avis_dynasty religion = "roman_catholic" @@ -1234,7 +1234,7 @@ historical_portugal0014 } } -historical_portugal0015 #post-event confusion, not son +historical_portugal0015 = { #post-event confusion, not son name="Manuel" dynasty = avis_dynasty religion = "roman_catholic" @@ -1248,7 +1248,7 @@ historical_portugal0015 #post-event confusion, not son } } -historical_portugal0016 +historical_portugal0016 = { name="João" dynasty = avis_dynasty religion = "roman_catholic" @@ -1262,7 +1262,7 @@ historical_portugal0016 } } -historical_portugal0017 #post-event confusion, not son +historical_portugal0017 = { #post-event confusion, not son name="Sebastião" dynasty = avis_dynasty religion = "sebastianist" @@ -1276,7 +1276,7 @@ historical_portugal0017 #post-event confusion, not son } } -historical_portugal0018 +historical_portugal0018 = { name="Henrique" dynasty = avis_dynasty religion = "roman_catholic" @@ -1291,7 +1291,7 @@ historical_portugal0018 } } -historical_portugal0019 +historical_portugal0019 = { name="João" dynasty = braganza_dynasty religion = "roman_catholic" @@ -1304,7 +1304,7 @@ historical_portugal0019 } } -historical_portugal0020 +historical_portugal0020 = { name="Afonso" dynasty = braganza_dynasty religion = "roman_catholic" @@ -1318,7 +1318,7 @@ historical_portugal0020 } } -historical_portugal0021 +historical_portugal0021 = { name="Pedro" dynasty = braganza_dynasty religion = "roman_catholic" @@ -1332,7 +1332,7 @@ historical_portugal0021 } } -historical_portugal0022 +historical_portugal0022 = { name="João" dynasty = braganza_dynasty religion = "roman_catholic" @@ -1346,7 +1346,7 @@ historical_portugal0022 } } -historical_portugal0023 +historical_portugal0023 = { name="José" dynasty = braganza_dynasty religion = "roman_catholic" @@ -1360,7 +1360,7 @@ historical_portugal0023 } } -historical_portugal0024 +historical_portugal0024 = { name="Maria" dynasty = braganza_dynasty religion = "roman_catholic" @@ -1376,7 +1376,7 @@ historical_portugal0024 } } -historical_portugal0024_2 +historical_portugal0024_2 = { name="Pedro" dynasty = braganza_dynasty religion = "roman_catholic" @@ -1390,7 +1390,7 @@ historical_portugal0024_2 } } -historical_portugal0025 +historical_portugal0025 = { name="João" dynasty = braganza_dynasty religion = "roman_catholic" @@ -1404,7 +1404,7 @@ historical_portugal0025 } } -historical_portugal0026 #Considered Brazilian, mythologized rule +historical_portugal0026 = { #Considered Brazilian, mythologized rule name="Pedro" dynasty = braganza_dynasty religion = "roman_catholic" @@ -1419,7 +1419,7 @@ historical_portugal0026 #Considered Brazilian, mythologized rule } } -historical_portugal0027 +historical_portugal0027 = { name="Maria" dynasty = braganza_dynasty religion = "roman_catholic" @@ -1434,7 +1434,7 @@ historical_portugal0027 } } -historical_portugal0028 +historical_portugal0028 = { name="Pedro" dynasty = braganza_dynasty religion = "roman_catholic" @@ -1448,7 +1448,7 @@ historical_portugal0028 } } -historical_portugal0029 +historical_portugal0029 = { name="Luís" dynasty = braganza_dynasty religion = "roman_catholic" @@ -1462,7 +1462,7 @@ historical_portugal0029 } } -historical_portugal0030 +historical_portugal0030 = { name="Carlos" dynasty = braganza_dynasty religion = "roman_catholic" @@ -1476,7 +1476,7 @@ historical_portugal0030 } } -historical_portugal0031 +historical_portugal0031 = { name="Carlos" dynasty = braganza_dynasty religion = "roman_catholic" @@ -1492,7 +1492,7 @@ historical_portugal0031 ###_SPANISH_### -historical_spain0001 +historical_spain0001 = { name="Felipe" dynasty = habsburg_espana_dynasty religion = "roman_catholic" @@ -1511,7 +1511,7 @@ historical_spain0001 } } -historical_spain0002 +historical_spain0002 = { name="Felipe" dynasty = habsburg_espana_dynasty religion = "roman_catholic" @@ -1529,7 +1529,7 @@ historical_spain0002 } } -historical_spain0003 +historical_spain0003 = { name="Felipe" dynasty = habsburg_espana_dynasty religion = "roman_catholic" diff --git a/localization/english/replace/names/NEOW_character_names_l_english.yml b/localization/english/replace/names/NEOW_character_names_l_english.yml index 7666a0696..4d644a402 100644 --- a/localization/english/replace/names/NEOW_character_names_l_english.yml +++ b/localization/english/replace/names/NEOW_character_names_l_english.yml @@ -19500,6 +19500,7 @@ Th_e_act_kla:0 "Thékla" Kater_i_act_na:0 "Katerína" Kyprian_i_act_:0 "Kyprianí" + Kle_o_act_pas:0 "Kleópas" Mel_i_act_na:0 "Melína" Maro_u_act_lla:0 "Maroúlla" Mel_e_act_k:0 "Melék"