diff --git a/common/decisions/religious_decisions_NEOW.txt b/common/decisions/religious_decisions_NEOW.txt index 4c606820..a21531ff 100644 --- a/common/decisions/religious_decisions_NEOW.txt +++ b/common/decisions/religious_decisions_NEOW.txt @@ -155,101 +155,6 @@ select_personal_deity_folketero_decision = { } } - ai_will_do = { - base = 100 - } -} - - -select_personal_deity_orthodox_decision = { - picture = { - reference = "gfx/interface/illustrations/decisions/decision_personal_religious.dds" - } - desc = select_personal_deity_orthodox_decision_desc - selection_tooltip = select_personal_deity_orthodox_decision_tooltip - - is_shown = { - # Following a valid religion & faith. - faith = faith:orthodox - - faith = { has_doctrine_parameter = select_personal_god_active } - } - - is_valid = { - } - - is_valid_showing_failures_only = { - # Have to at _least_ not be in piety debt. - piety >= 0 - } - - cooldown = { years = 2 } - - effect = { - # Show the possible options. - show_as_tooltip = { - random_list = { - desc = select_personal_deity_orthodox_decision_tt - 100 = { - show_chance = no - desc = select_personal_deity_orthodox_decision.select_paisos - add_character_modifier = bhakti_orthodox_paisos - } - 100 = { - show_chance = no - desc = select_personal_deity_orthodox_decision.select_gabriel - add_character_modifier = bhakti_orthodox_gabriel - } - 100 = { - trigger = {is_vaguely_nistrenian_bhakti_trigger = yes} - show_chance = no - desc = select_personal_deity_orthodox_decision.select_adriana - add_character_modifier = bhakti_orthodox_adriana - } - 100 = { - trigger = {is_vaguely_nistrenian_bhakti_trigger = no} - show_chance = no - desc = select_personal_deity_orthodox_decision.select_olga - add_character_modifier = bhakti_orthodox_olga - } - 100 = { - show_chance = no - desc = select_personal_deity_orthodox_decision.select_palamas - add_character_modifier = bhakti_orthodox_palamas - } - 100 = { - show_chance = no - desc = select_personal_deity_orthodox_decision.select_surgeon - add_character_modifier = bhakti_orthodox_surgeon - } - 100 = { - show_chance = no - desc = select_personal_deity_orthodox_decision.select_lazar - add_character_modifier = bhakti_orthodox_lazar - } - 100 = { - show_chance = no - desc = select_personal_deity_orthodox_decision.select_theotokos - add_character_modifier = bhakti_orthodox_theotokos - } - } - } - # And the actual effect. - trigger_event = NEOW_religious_decision.0104 - } - - ai_check_interval = 96 - - ai_potential = { - piety >= minor_piety_value - NOR = { - has_character_modifier = bhakti_orthodox_olaf - has_character_modifier = bhakti_orthodox_lucia - has_character_modifier = bhakti_orthodox_jesus - has_character_modifier = bhakti_orthodox_per - } - } - ai_will_do = { base = 100 } diff --git a/common/modifiers/00_NEOW_religion_modifiers.txt b/common/modifiers/00_NEOW_religion_modifiers.txt index 433a60f8..bbde905a 100644 --- a/common/modifiers/00_NEOW_religion_modifiers.txt +++ b/common/modifiers/00_NEOW_religion_modifiers.txt @@ -62,60 +62,4 @@ bhakti_folketero_olaf = { icon = stewardship_positive stewardship = 1 monthly_county_control_growth_add = 0.1 -} - -####Orthodox Saints - -bhakti_orthodox_paisos = { - icon = learning_positive - learning = 1 - monthly_piety = 0.5 - enemy_hostile_scheme_success_chance_add = -0.1 -} - -bhakti_orthodox_gabriel = { - icon = letter_positive - learning = 1 - monthly_piety = 1 -} - -bhakti_orthodox_adriana = { - icon = prestige_positive - monthly_prestige = 0.1 - domain_tax_same_faith_mult = 0.05 - vassal_tax_mult = 0.05 -} - -bhakti_orthodox_palamas = { - icon = learning_positive - learning = 1 - monthly_piety = 0.1 - monthly_learning_lifestyle_xp_gain_mult = 0.1 -} -bhakti_orthodox_surgeon = { - icon = treatmnet_positive - life_expectancy = 5 - health = 0.1 - negate_health_penalty_add = 0.1 -} - -bhakti_orthodox_lazar = { - icon = prowess_positive - martial = 1 - prowess = 3 - knight_effectiveness_mult = 0.05 -} - -bhakti_orthodox_theotokos = { - icon = family_positive - county_opinion_add = 10 - fertility = 0.1 - monthly_piety -} - -bhakti_orthodox_olga = { - icon = prestige_positive - monthly_prestige = 0.1 - domain_tax_same_faith_mult = 0.05 - vassal_tax_mult = 0.05 } \ No newline at end of file diff --git a/common/religion/doctrine_types/30_core_tenets.txt b/common/religion/doctrine_types/30_core_tenets.txt index 3f4d917c..e5e372b5 100644 --- a/common/religion/doctrine_types/30_core_tenets.txt +++ b/common/religion/doctrine_types/30_core_tenets.txt @@ -3053,10 +3053,6 @@ triggered_desc = { faith = faith:folketro desc = tenet_bhakti_folketro_name - } - triggered_desc = { - trigger = { religion_tag = orthodox_religion } - desc = tenet_bhakti_orthodox_name } desc = tenet_bhakti_patron_god_name } @@ -3068,10 +3064,6 @@ faith = faith:folketro desc = tenet_bhakti_folketro_desc } - triggered_desc = { - trigger = { religion_tag = orthodox_religion } - desc = tenet_bhakti_orthodox_desc - } desc = tenet_bhakti_desc } } @@ -3082,7 +3074,6 @@ is_shown = { OR = { religion_tag = hinduism_religion - religion_tag = orthodox_religion # With FP1, Germanics also get personal deities. AND = { religion_tag = folkgerman_religion diff --git a/common/religion/religion_types/NEOW_orthodox.txt b/common/religion/religion_types/NEOW_orthodox.txt index 3f547b7e..91f3b98b 100644 --- a/common/religion/religion_types/NEOW_orthodox.txt +++ b/common/religion/religion_types/NEOW_orthodox.txt @@ -159,10 +159,10 @@ WaterGodHerHis = CHARACTER_HERHIS_HIS WaterGodHerHim = CHARACTER_HERHIM_HIM - PantheonTerm = orthodox_pantheon - PantheonTerm2 = orthodox_pantheon - PantheonTerm3 = orthodox_pantheon - PantheonTermHasHave = pantheon_term_have + PantheonTerm = christianity_high_god_name + PantheonTerm2 = christianity_high_god_name_2 + PantheonTerm3 = christianity_high_god_name_3 + PantheonTermHasHave = pantheon_term_has GoodGodNames = { christianity_high_god_name christianity_high_god_name_alternate @@ -259,7 +259,7 @@ #Tenets doctrine = tenet_catholic_communion - doctrine = tenet_bhakti + doctrine = tenet_pentarchy doctrine = tenet_monasticism holy_order_names = { diff --git a/common/scripted_triggers/01_fp1_scripted_triggers.txt b/common/scripted_triggers/01_fp1_scripted_triggers.txt index e6563c60..24c45ff5 100644 --- a/common/scripted_triggers/01_fp1_scripted_triggers.txt +++ b/common/scripted_triggers/01_fp1_scripted_triggers.txt @@ -115,18 +115,6 @@ fp1_remove_stele_new_holder_trigger = { } } -is_vaguely_nistrenian_bhakti_trigger = { - OR = { - has_cultural_pillar = heritage_east_romance - culture = { has_name_list = name_list_danish } - # We deliberately use the de jure rather than the geographical area to make this at least a *little* more fluid. - AND = { - is_playable_character = yes - capital_county.empire = title:e_nistrenia - } - } -} - is_vaguely_danish_bhakti_trigger = { OR = { has_culture = culture:danish diff --git a/events/religion_events/NEOW_religious_decision_events.txt b/events/religion_events/NEOW_religious_decision_events.txt index 648c322c..70992c3d 100644 --- a/events/religion_events/NEOW_religious_decision_events.txt +++ b/events/religion_events/NEOW_religious_decision_events.txt @@ -119,81 +119,6 @@ NEOW_religious_decision.0103 = { #custom patron gods for Leviathan NEOW_set_bhakti_effect = { BHAKTI = bhakti_folketero_olaf } } - # Opt-Out - option = { - name = NEOW_religious_decision.0001.optout - flavor = NEOW_religious_decision.0001.flavor - - ai_chance = { - base = 0 - } - } -} - -NEOW_religious_decision.0104 = { #custom icons for orthodoxy - type = character_event - title = NEOW_religious_decision.0104.t - desc = NEOW_religious_decision.0104.desc - theme = faith - left_portrait = { - character = root - animation = personality_rational - } - - option = { - name = NEOW_religious_decision.0104.paisos - trigger = { - NOT = { has_character_modifier = bhakti_orthodox_paisos } - } - NEOW_set_bhakti_effect = { BHAKTI = bhakti_orthodox_paisos} - } - - option = { - name = NEOW_religious_decision.0104.gabriel - trigger = { - NOT = { has_character_modifier = bhakti_orthodox_gabriel } - } - NEOW_set_bhakti_effect = { BHAKTI = bhakti_orthodox_gabriel } - } - - option = { - name = NEOW_religious_decision.0104.adriana - trigger = { - NOT = { has_character_modifier = bhakti_orthodox_adriana } - } - NEOW_set_bhakti_effect = { BHAKTI = bhakti_orthodox_adriana } - } - - option = { - name = NEOW_religious_decision.0104.palamas - trigger = { - NOT = { has_character_modifier = bhakti_orthodox_palamas } - } - NEOW_set_bhakti_effect = { BHAKTI = bhakti_orthodox_palamas } - } - option = { - name = NEOW_religious_decision.0104.surgeon - trigger = { - NOT = { has_character_modifier = bhakti_orthodox_surgeon } - } - NEOW_set_bhakti_effect = { BHAKTI = bhakti_orthodox_surgeon } - } - - option = { - name = NEOW_religious_decision.0104.lazar - trigger = { - NOT = { has_character_modifier = bhakti_orthodox_lazar } - } - NEOW_set_bhakti_effect = { BHAKTI = bhakti_orthodox_lazar } - } - - option = { - name = NEOW_religious_decision.0104.theotokos - trigger = { - NOT = { has_character_modifier = bhakti_orthodox_theotokos } - } - NEOW_set_bhakti_effect = { BHAKTI = bhakti_orthodox_theotokos } - } # Opt-Out option = { name = NEOW_religious_decision.0001.optout diff --git a/localization/english/replace/decisions_l_english.yml b/localization/english/replace/decisions_l_english.yml index 797ce424..0aad203e 100644 --- a/localization/english/replace/decisions_l_english.yml +++ b/localization/english/replace/decisions_l_english.yml @@ -193,25 +193,15 @@ select_personal_deity_folketero_decision:0 "Determine Personal Helgen" select_personal_deity_folketero_decision_tooltip:0 "Think about [ROOT.Char.GetFaith.PantheonTerm]" select_personal_deity_folketero_decision_desc:1 "#F It is not uncommon for [ROOT.Char.GetFaith.GetAdherentNamePluralNoTooltip] to single out one amongst [ROOT.Char.GetFaith.PantheonTerm] who suits their particular tastes and aims in life for special attention.\n\nI should contemplate these divine beings and decide which one calls to me the most.#!" - select_personal_deity_folketero_decision_confirm:0 "Dedicate your Worship to a particular Helhen" + select_personal_deity_folketero_decision_confirm:0 "Dedicate your Worship to a particular God" select_personal_deity_folketero_decision_tt:1 "You begin to live your life according to the values of" select_personal_deity_folketero_decision.select_jesus:0 "Jesus, The Warrior and Savior" select_personal_deity_folketero_decision.select_per:0 "Sankt Per, Judge of the Dead" select_personal_deity_folketero_decision.select_olaf:0 "Sankt Olaf, Guardian of Rulers" select_personal_deity_folketero_decision.select_lucia:0 "Sankt Lucia, Heart Warmer" - select_personal_deity_orthodox_decision:0 "Determine Patron Saint" - select_personal_deity_orthodox_decision_tooltip:0 "Think about [ROOT.Char.GetFaith.PantheonTerm]" - select_personal_deity_orthodox_decision_desc:1 "#F It is not uncommon for [ROOT.Char.GetFaith.GetAdherentNamePluralNoTooltip] to single out one amongst [ROOT.Char.GetFaith.PantheonTerm] who suits their particular tastes and aims in life for special attention.\n\nI should contemplate these divine beings and decide which one calls to me the most.#!" - select_personal_deity_orthodox_decision_confirm:0 "Dedicate your Worship to a particular Saint" - select_personal_deity_orthodox_decision_tt:1 "You begin to live your life according to the values of" - select_personal_deity_orthodox_decision.select_paisos:0 "Saint Paisios the Athonite" - select_personal_deity_orthodox_decision.select_gabriel:0 "Saint Gabriel of Georgia" - select_personal_deity_orthodox_decision.select_adriana:0 "Saint Adriana of Nistrenia" - select_personal_deity_orthodox_decision.select_palamas:0 "Saint Gregory Palamas" - select_personal_deity_orthodox_decision.select_surgeon:0 "Saint Luke the Surgeon" - select_personal_deity_orthodox_decision.select_lazar:0 "Saint Lazar of Serbia" - select_personal_deity_orthodox_decision.select_theotokos:0 "The Blessed Theotokos" + + #N3OW Added: select_personal_leviathan_union_decision:0 "Determine Leviathan Union" diff --git a/localization/english/replace/event_localization/religion_events/zz_NEOW_religious_decisions_l_english.yml b/localization/english/replace/event_localization/religion_events/zz_NEOW_religious_decisions_l_english.yml index 6237a383..4eb9eee9 100644 --- a/localization/english/replace/event_localization/religion_events/zz_NEOW_religious_decisions_l_english.yml +++ b/localization/english/replace/event_localization/religion_events/zz_NEOW_religious_decisions_l_english.yml @@ -57,15 +57,4 @@ NEOW_religious_decision.0103.lucia:0 "Lucia, the Warm-Hearted!" NEOW_religious_decision.0103.olaf:0 "Olaf, Guardian of Rulers!"" NEOW_religious_decision.0103.optout:0 "$religious_decision.0101.flavor$" - NEOW_religious_decision.0103.flavor:0 "$religious_decision.0101.flavor$" - - NEOW_religious_decision.0104.t:0 "Deciding on a Saint" - NEOW_religious_decision.0104.desc:0 "[ROOT.Char.GetFaith.PantheonTerm|U] are many, yet I cannot say that there are not some who hold a level of special appeal for me. Were I to dedicate myself openly to the express worship of primarily one such deity, I would doubtless draw like-minded souls to my side.\n\nWhatever the blessings my patron provides, being with similar [ROOT.Char.GetFaith.GetAdherentNamePluralNoTooltip] can only bring me health, wealth, and glory." - NEOW_religious_decision.0104.paisos:0 "Saint Paisios the Athonite!" - NEOW_religious_decision.0104.gabriel:0 "Saint Gabriel of Georgia!" - NEOW_religious_decision.0104.adriana:0 "Saint Adriana of Sorroca!" - NEOW_religious_decision.0104.olga:0 "Saint Olga of Kyiv!" - NEOW_religious_decision.0104.palamas:0 "Saint Gregory Palamas!"" - NEOW_religious_decision.0104.surgeon:0 "Saint Luke the Surgeon!" - NEOW_religious_decision.0104.lazar:0 "Saint Lazar of Serbia!" - NEOW_religious_decision.0104.theotokos:0 "The Blessed Theotokos!"" \ No newline at end of file + NEOW_religious_decision.0103.flavor:0 "$religious_decision.0101.flavor$" \ No newline at end of file diff --git a/localization/english/replace/modifiers/NEOW_modifiers_l_english.yml b/localization/english/replace/modifiers/NEOW_modifiers_l_english.yml index e0a9ee6b..987a2d6d 100644 --- a/localization/english/replace/modifiers/NEOW_modifiers_l_english.yml +++ b/localization/english/replace/modifiers/NEOW_modifiers_l_english.yml @@ -22,22 +22,4 @@ bhakti_folketero_per_desc:0 "This character emulates the judge of the dead." bhakti_folketero_lucia: "Sankt Lucia" bhakti_folketero_lucia_desc:0 "This character emulates the kind heart-warmer." bhakti_folketero_olaf: "Sankt Olaf" -bhakti_folketero_olaf_desc:0 "This character emulates the patron and guardian of rulers." - - -bhakti_orthodox_paisos: "Saint Paisios the Athonite" -bhakti_orthodox_paisos_desc:0 "This character's patron is the great monastic who foresaw a great cataclysm." -bhakti_orthodox_gabriel: "Saint Gabriel of Georgia" -bhakti_orthodox_gabriel_desc:0 "This character's patron is the fool for Christ who was a friend to all save the beast." -bhakti_orthodox_adriana: "Saint Adriana of Sorroca" -bhakti_orthodox_adriana_desc:0 "This character's patron is the great founder of Nistria who brought stability and prosperity to the land." -bhakti_orthodox_palamas: "Saint Gregory Palamas" -bhakti_orthodox_palamas_desc:0 "This character's patron is the great pillar of Orthodoxy who preserve the ancient faith in its fullness." -bhakti_orthodox_surgeon: "Saint Luke the Surgeon" -bhakti_orthodox_surgeon_desc:0 "This character's patron is the great surgeon-saint who saved countless lives with his prayer and medical knowledge." -bhakti_orthodox_lazar: "Saint Lazar of Serbia" -bhakti_orthodox_lazar_desc:0 "This characters patron's is the grand prince-martyr who was martyred defending his people from an invading army." -bhakti_orthodox_theotokos: "Blessed Theotokos" -bhakti_orthodox_theotokos_desc:0 "This character's patron is the Mother of our Lord who without corruption gave birth to God the Word." -bhakti_orthodox_olga: "Saint Olga of Kyiv" -bhakti_orthodox_olga_desc:0 "This character's patron is the equal to the apostles who during her rule as regent brought stability and prosperity to her lands." \ No newline at end of file +bhakti_folketero_olaf_desc:0 "This character emulates the patron and guardian of rulers." \ No newline at end of file diff --git a/localization/english/replace/religion/zz_NEOW_religion_orthodox_l_english.yml b/localization/english/replace/religion/zz_NEOW_religion_orthodox_l_english.yml index e7456848..43fba744 100644 --- a/localization/english/replace/religion/zz_NEOW_religion_orthodox_l_english.yml +++ b/localization/english/replace/religion/zz_NEOW_religion_orthodox_l_english.yml @@ -6,8 +6,6 @@ eastern_orthodox_religion_adherent_plural:1 "Eastern Orthodox" eastern_orthodox_religion_desc:1 "One of the largest branches of Christianity, the Eastern Orthodox claim to be the successors of the original Christian Church of antiquity. Rooted in ancient traditions like monasticism and iconography, the Eastern Orthodox are resistant to change, withstanding the fires of the Event better than most." - orthodox_pantheon:0 "The Saints" - orthodox:0 "Eastern Orthodox Church" orthodox_adj:0 "Eastern Orthodox" orthodox_adherent:0 "Eastern Orthodox"