diff --git a/N3OW/common/religion/doctrines/00_1_neow_universal_tolerance_doctrines.txt b/N3OW/common/religion/doctrines/00_1_neow_universal_tolerance_doctrines.txt index 2818c526..6f90868c 100644 --- a/N3OW/common/religion/doctrines/00_1_neow_universal_tolerance_doctrines.txt +++ b/N3OW/common/religion/doctrines/00_1_neow_universal_tolerance_doctrines.txt @@ -49,7 +49,6 @@ parameters = { hostility_override_special_doctrine_roman_rite = 0 hostility_override_special_doctrine_independent_catholic = 1 - hostility_override_special_doctrine_dharmic_catholicism = 1 hostility_override_special_doctrine_sevillian_rite = 2 hostility_override_special_doctrine_incorruptible_dogma = 3 } @@ -90,7 +89,6 @@ parameters = { hostility_override_special_doctrine_sevillian_rite = 0 hostility_override_special_doctrine_independent_catholic = 1 - hostility_override_special_doctrine_dharmic_catholicism = 1 hostility_override_special_doctrine_roman_rite = 2 hostility_override_special_doctrine_incorruptible_dogma = 3 } @@ -131,7 +129,6 @@ parameters = { hostility_override_special_doctrine_roman_rite = 1 hostility_override_special_doctrine_independent_catholic = 1 - hostility_override_special_doctrine_dharmic_catholicism = 1 hostility_override_special_doctrine_sevillian_rite = 1 hostility_override_special_doctrine_incorruptible_dogma = 3 } @@ -154,57 +151,15 @@ } } #Interfaith (shared) Doctrines - special_doctrine_dharmic_catholicism = { - is_shown = { - OR = { - religion_tag = catholic_religion - religion_tag = buddhism_religion - } - } - - can_pick = { - custom_description = { - text = TOO_DIVERGENT - NOR = { - doctrine:tenet_adorcism = { is_in_list = selected_doctrines } - doctrine:tenet_carnal_exaltation = { is_in_list = selected_doctrines } # I'm on the shorterlist! - doctrine:tenet_divine_marriage = { is_in_list = selected_doctrines } - doctrine:tenet_gnosticism = { is_in_list = selected_doctrines } - doctrine:tenet_gruesome_festivals = { is_in_list = selected_doctrines } # I'm on the shorterlist! - doctrine:tenet_human_sacrifice = { is_in_list = selected_doctrines } # I'm on the shorterlist! - doctrine:tenet_exaltation_of_pain = { is_in_list = selected_doctrines } # I'm on the shorterlist! - doctrine:tenet_consolamentum = { is_in_list = selected_doctrines } - doctrine:tenet_sacrificial_ceremonies = { is_in_list = selected_doctrines } # I'm on the shorterlist! - doctrine:tenet_sun_worship = { is_in_list = selected_doctrines } # I'm on the shorterlist! - doctrine:tenet_ritual_cannibalism = { is_in_list = selected_doctrines } # I'm on the shorterlist! - doctrine:tenet_fp3_fedayeen = { is_in_list = selected_doctrines } # I'm on the shorterlist! - } - } - } - - piety_cost = { - value = faith_doctrine_cost_low - if = { - limit = { has_doctrine = special_doctrine_dharmic_catholicism } - multiply = faith_unchanged_tolerance_doctrine_cost_mult - } - } - - parameters = { - hostility_override_special_doctrine_roman_rite = 1 - hostility_override_special_doctrine_independent_catholic = 1 - hostility_override_special_doctrine_dharmic_catholicism = 1 - hostility_override_special_doctrine_sevillian_rite = 1 - hostility_override_special_doctrine_incorruptible_dogma = 3 - } - } special_doctrine_people_of_the_book = { is_shown = { OR = { religion_tag = catholic_religion + religion_tag = europeanist_religion religion_tag = islam_religion religion_tag = novelist_religion + religion_tag = third_estatist_religion has_doctrine = special_doctrine_people_of_the_book } } @@ -237,9 +192,6 @@ multiply = faith_unchanged_tolerance_doctrine_cost_mult } } - parameters = { - hostility_override_special_doctrine_christian = 1 - } } #Hate Everyone Doctrines special_doctrine_incorruptible_dogma = { #Catholic one diff --git a/N3OW/common/religion/doctrines/NEOW_tenets.txt b/N3OW/common/religion/doctrines/NEOW_tenets.txt index b7413337..fa524955 100644 --- a/N3OW/common/religion/doctrines/NEOW_tenets.txt +++ b/N3OW/common/religion/doctrines/NEOW_tenets.txt @@ -638,7 +638,6 @@ doctrine_core_tenets = { parameters = { pilgrimage_decision_active = yes take_vows_active = yes - hostility_override_special_doctrine_christian = 1 } } diff --git a/N3OW/common/religion/religions/00_buddhism.txt b/N3OW/common/religion/religions/00_buddhism.txt index 267412ac..9367e964 100644 --- a/N3OW/common/religion/religions/00_buddhism.txt +++ b/N3OW/common/religion/religions/00_buddhism.txt @@ -251,11 +251,9 @@ #holy_site = segrada_familia #Special Tolerance | placeholder - doctrine = special_doctrine_dharmic_catholicism - doctrine = special_doctrine_christian #Tenets | placeholder - doctrine = tenet_eastern_syncretism + doctrine = tenet_christian_syncretism doctrine = tenet_inner_journey doctrine = tenet_monasticism diff --git a/N3OW/common/religion/religions/NEOW_anglican.txt b/N3OW/common/religion/religions/NEOW_anglican.txt index ddbd52d3..bb02ad74 100644 --- a/N3OW/common/religion/religions/NEOW_anglican.txt +++ b/N3OW/common/religion/religions/NEOW_anglican.txt @@ -36,6 +36,9 @@ #Funeral tradition | placeholder doctrine = doctrine_funeral_stoic + #Special/Syncretic target doctrines + doctrine = special_doctrine_is_christian_faith + traits = { virtues = { forgiving compassionate chaste } sins = { vengeful sadistic lustful } @@ -256,7 +259,6 @@ #Special Tolerance | placeholder doctrine = special_doctrine_via_media - doctrine = special_doctrine_christian #Tenets | placeholder doctrine = against_all_odds diff --git a/N3OW/common/religion/religions/NEOW_calvinist.txt b/N3OW/common/religion/religions/NEOW_calvinist.txt index 42715428..0a38c074 100644 --- a/N3OW/common/religion/religions/NEOW_calvinist.txt +++ b/N3OW/common/religion/religions/NEOW_calvinist.txt @@ -36,6 +36,9 @@ #Funeral tradition doctrine = doctrine_funeral_stoic + #Special/Syncretic target doctrines + doctrine = special_doctrine_is_christian_faith + traits = { virtues = { forgiving compassionate chaste } sins = { vengeful sadistic lustful } @@ -256,7 +259,6 @@ #holy_site = segrada_familia #Special Tolerance | placeholder - doctrine = special_doctrine_christian #Tenets | placeholder doctrine = tenet_aniconism @@ -289,7 +291,6 @@ doctrine = doctrine_witchcraft_crime #Special Tolerance | placeholder - doctrine = special_doctrine_christian #Tenets | placeholder doctrine = tenet_aniconism @@ -316,7 +317,6 @@ #holy_site = segrada_familia #Special Tolerance | placeholder - doctrine = special_doctrine_christian #Tenets | placeholder doctrine = tenet_aniconism diff --git a/N3OW/common/religion/religions/NEOW_catholic.txt b/N3OW/common/religion/religions/NEOW_catholic.txt index 0ad2f1b5..e27a105c 100644 --- a/N3OW/common/religion/religions/NEOW_catholic.txt +++ b/N3OW/common/religion/religions/NEOW_catholic.txt @@ -36,6 +36,9 @@ #Funeral tradition | placeholder doctrine = doctrine_funeral_stoic + #Special/Syncretic target doctrines + doctrine = special_doctrine_is_christian_faith + traits = { virtues = { forgiving compassionate chaste } sins = { vengeful sadistic lustful } @@ -256,7 +259,6 @@ #Special Tolerance | placeholder doctrine = special_doctrine_people_of_the_book - doctrine = special_doctrine_christian doctrine = doctrine_gender_female_dominated doctrine = doctrine_pluralism_fundamentalist @@ -337,7 +339,6 @@ #Special Tolerance | placeholder doctrine = special_doctrine_people_of_the_book - doctrine = special_doctrine_christian #Tenets | placeholder doctrine = tenet_catholic_communion @@ -414,7 +415,7 @@ #Special Tolerance | placeholder doctrine = special_doctrine_roman_rite - doctrine = special_doctrine_christian + doctrine = doctrine_bastardry_none #Tenets | placeholder doctrine = tenet_catholic_communion @@ -491,7 +492,7 @@ #Special Tolerance | placeholder doctrine = special_doctrine_sevillian_rite - doctrine = special_doctrine_christian + #Tenets | placeholder doctrine = tenet_communion @@ -571,7 +572,6 @@ #Special Tolerance | placeholder doctrine = special_doctrine_roman_rite - doctrine = special_doctrine_christian #Tenets | placeholder doctrine = tenet_catholic_communion @@ -648,7 +648,6 @@ #Special Tolerance | placeholder doctrine = special_doctrine_roman_rite - doctrine = special_doctrine_christian #Tenets | placeholder doctrine = tenet_catholic_communion @@ -724,7 +723,6 @@ #Special Tolerance | placeholder doctrine = special_doctrine_roman_rite - doctrine = special_doctrine_christian #Tenets | placeholder doctrine = tenet_catholic_communion @@ -800,7 +798,6 @@ #Special Tolerance | placeholder doctrine = special_doctrine_incorruptible_dogma - doctrine = special_doctrine_christian #Tenets | placeholder doctrine = tenet_pacifism @@ -877,7 +874,6 @@ #Special Tolerance | placeholder doctrine = special_doctrine_incorruptible_dogma - doctrine = special_doctrine_christian #Tenets | placeholder doctrine = tenet_sacred_shadows @@ -954,7 +950,6 @@ #Special Tolerance | placeholder doctrine = special_doctrine_incorruptible_dogma - doctrine = special_doctrine_christian #Tenets | placeholder doctrine = tenet_asceticism @@ -1031,7 +1026,6 @@ #Special Tolerance | placeholder doctrine = special_doctrine_incorruptible_dogma - doctrine = special_doctrine_christian #Tenets | placeholder doctrine = tenet_ancestor_worship @@ -1108,7 +1102,6 @@ #Special Tolerance | placeholder doctrine = special_doctrine_roman_rite - doctrine = special_doctrine_christian #Tenets | placeholder doctrine = tenet_catholic_communion @@ -1185,7 +1178,6 @@ #Special Tolerance | placeholder doctrine = special_doctrine_roman_rite - doctrine = special_doctrine_christian #Tenets | placeholder doctrine = tenet_sun_worship @@ -1262,7 +1254,6 @@ #Special Tolerance | placeholder doctrine = special_doctrine_roman_rite - doctrine = special_doctrine_christian #Tenets | placeholder doctrine = tenet_catholic_communion diff --git a/N3OW/common/religion/religions/NEOW_cosmist.txt b/N3OW/common/religion/religions/NEOW_cosmist.txt index 4b14f949..80b897e5 100644 --- a/N3OW/common/religion/religions/NEOW_cosmist.txt +++ b/N3OW/common/religion/religions/NEOW_cosmist.txt @@ -256,7 +256,6 @@ #holy_site = segrada_familia #Special Tolerance | placeholder - doctrine = special_doctrine_christian #Tenets | placeholder doctrine = tenet_megaliths @@ -284,7 +283,6 @@ #holy_site = segrada_familia #Special Tolerance | placeholder - doctrine = special_doctrine_christian #Tenets | placeholder doctrine = tenet_asceticism diff --git a/N3OW/common/religion/religions/NEOW_europeanist.txt b/N3OW/common/religion/religions/NEOW_europeanist.txt index 72cbe89b..a10af41c 100644 --- a/N3OW/common/religion/religions/NEOW_europeanist.txt +++ b/N3OW/common/religion/religions/NEOW_europeanist.txt @@ -241,8 +241,6 @@ holy_site = london #Special Tolerance | placeholder - #doctrine = special_doctrine_ecumenical_christian - #doctrine = special_doctrine_people_of_the_book #Tenets | placeholder doctrine = core_tenet_belle_epoque @@ -269,7 +267,6 @@ #holy_site = segrada_familia #Special Tolerance | placeholder - #doctrine = special_doctrine_ecumenical_christian doctrine = special_doctrine_people_of_the_book #Tenets | placeholder diff --git a/N3OW/common/religion/religions/NEOW_hussite.txt b/N3OW/common/religion/religions/NEOW_hussite.txt index e5340f84..eff2e3c7 100644 --- a/N3OW/common/religion/religions/NEOW_hussite.txt +++ b/N3OW/common/religion/religions/NEOW_hussite.txt @@ -36,6 +36,9 @@ #Funeral tradition | placeholder doctrine = doctrine_funeral_stoic + #Special/Syncretic target doctrines + doctrine = special_doctrine_is_christian_faith + traits = { virtues = { forgiving compassionate chaste } sins = { vengeful sadistic lustful } @@ -254,8 +257,6 @@ #holy_site = segrada_familia #Special Tolerance | placeholder - doctrine = special_doctrine_people_of_the_book - doctrine = special_doctrine_christian #Tenets | placeholder doctrine = tenet_catholic_communion diff --git a/N3OW/common/religion/religions/NEOW_lutheranism.txt b/N3OW/common/religion/religions/NEOW_lutheranism.txt index 35d0de43..ff6dd5ae 100644 --- a/N3OW/common/religion/religions/NEOW_lutheranism.txt +++ b/N3OW/common/religion/religions/NEOW_lutheranism.txt @@ -36,6 +36,9 @@ #Funeral tradition | placeholder doctrine = doctrine_funeral_stoic + #Special/Syncretic target doctrines + doctrine = special_doctrine_is_christian_faith + traits = { virtues = { forgiving compassionate chaste } sins = { vengeful sadistic lustful } @@ -256,7 +259,7 @@ #holy_site = segrada_familia #Special Tolerance | placeholder - doctrine = special_doctrine_christian + #Tenets | placeholder doctrine = tenet_adaptive @@ -327,7 +330,7 @@ #holy_site = segrada_familia #Special Tolerance | placeholder - doctrine = special_doctrine_christian + #Tenets | placeholder doctrine = tenet_communal_possessions diff --git a/N3OW/common/religion/religions/NEOW_resurgentist.txt b/N3OW/common/religion/religions/NEOW_resurgentist.txt index 8ef61651..3f1084d8 100644 --- a/N3OW/common/religion/religions/NEOW_resurgentist.txt +++ b/N3OW/common/religion/religions/NEOW_resurgentist.txt @@ -255,8 +255,6 @@ #holy_site = segrada_familia #Special Tolerance | placeholder - #doctrine = special_doctrine_ecumenical_christian - #doctrine = special_doctrine_people_of_the_book #Tenets | placeholder doctrine = tenet_bhakti @@ -283,8 +281,6 @@ #holy_site = segrada_familia #Special Tolerance | placeholder - #doctrine = special_doctrine_ecumenical_christian - #doctrine = special_doctrine_people_of_the_book #Tenets | placeholder doctrine = tenet_bhakti @@ -311,8 +307,6 @@ #holy_site = segrada_familia #Special Tolerance | placeholder - #doctrine = special_doctrine_ecumenical_christian - #doctrine = special_doctrine_people_of_the_book #Tenets | placeholder doctrine = tenet_warmonger diff --git a/N3OW/common/religion/religions/NEOW_theomach.txt b/N3OW/common/religion/religions/NEOW_theomach.txt index 06b6b876..9aef2304 100644 --- a/N3OW/common/religion/religions/NEOW_theomach.txt +++ b/N3OW/common/religion/religions/NEOW_theomach.txt @@ -242,8 +242,6 @@ #holy_site = segrada_familia #Special Tolerance | placeholder - #doctrine = special_doctrine_ecumenical_christian - #doctrine = special_doctrine_people_of_the_book #Tenets | placeholder doctrine = tenet_religious_legal_pronouncements @@ -272,8 +270,6 @@ #holy_site = segrada_familia #Special Tolerance | placeholder - #doctrine = special_doctrine_ecumenical_christian - #doctrine = special_doctrine_people_of_the_book #Tenets | placeholder doctrine = tenet_religious_legal_pronouncements @@ -302,8 +298,6 @@ #holy_site = segrada_familia #Special Tolerance | placeholder - #doctrine = special_doctrine_ecumenical_christian - #doctrine = special_doctrine_people_of_the_book #Tenets | placeholder doctrine = tenet_religious_legal_pronouncements diff --git a/N3OW/common/religion/religions/NEOW_xenology.txt b/N3OW/common/religion/religions/NEOW_xenology.txt index 502cd226..d15f9698 100644 --- a/N3OW/common/religion/religions/NEOW_xenology.txt +++ b/N3OW/common/religion/religions/NEOW_xenology.txt @@ -240,8 +240,6 @@ #holy_site = segrada_familia #Special Tolerance | placeholder - #doctrine = special_doctrine_ecumenical_christian - #doctrine = special_doctrine_people_of_the_book #Tenets | placeholder doctrine = tenet_carnal_exaltation diff --git a/N3OW/common/religion/religions/NEOW_yugoslavist.txt b/N3OW/common/religion/religions/NEOW_yugoslavist.txt index 47b67058..2f4e2bde 100644 --- a/N3OW/common/religion/religions/NEOW_yugoslavist.txt +++ b/N3OW/common/religion/religions/NEOW_yugoslavist.txt @@ -242,8 +242,6 @@ #holy_site = segrada_familia #Special Tolerance | placeholder - #doctrine = special_doctrine_ecumenical_christian - #doctrine = special_doctrine_people_of_the_book #Tenets | placeholder doctrine = tenet_adaptive @@ -271,8 +269,6 @@ #holy_site = segrada_familia #Special Tolerance | placeholder - #doctrine = special_doctrine_ecumenical_christian - #doctrine = special_doctrine_people_of_the_book #Tenets | placeholder doctrine = tenet_fp3_fedayeen diff --git a/N3OW/localization/english/replace/religion/NEOW_religion_core_tenets_l_english.yml b/N3OW/localization/english/replace/religion/NEOW_religion_core_tenets_l_english.yml index 085a48d2..3ac8804c 100644 --- a/N3OW/localization/english/replace/religion/NEOW_religion_core_tenets_l_english.yml +++ b/N3OW/localization/english/replace/religion/NEOW_religion_core_tenets_l_english.yml @@ -27,7 +27,6 @@ doctrine_parameter_divine_the_stars_active:0 "Allows adherents to Divine the Stars and predict their future" doctrine_parameter_durandal_restoration_active:0 "Rulers may seek to restore Durendal" doctrine_parameter_novelist_title_replace_active:0 "Replaces most kingdom and empire titles in Western Europe" - doctrine_parameter_hostility_override_special_doctrine_christian:0 "Christian [faiths|E] are considered only [GetHostilityLevelName( TOKEN_PARAMETER.GetIntValue )|V]" doctrine_parameter_easier_to_convert_faith_in_hills_forests:0 "[convert_county|E] speed in Forest and Hill [terrain|E]: #P +[EmptyScope.ScriptValue('easier_to_convert_faith_in_hills_forests_bonus_loc_control')|0]%#!" doctrine_parameter_easier_to_convert_culture_in_same_faith_hills_forests:0 "[promote_culture|E] speed in same-[faith|E] Forest and Hill [terrain|E]: #P +[EmptyScope.ScriptValue('promote_culture_easier_to_convert_culture_in_same_faith_hills_forests_bonus_loc_control')|0]%#!" doctrine_parameter_harder_to_convert_faith_away_in_hills_forests:0 "Hostile [convert_county|E] speed in Forest and Hill [terrain|E]: #P [EmptyScope.ScriptValue('harder_to_convert_faith_away_in_hills_forests_malus_loc_control')|0]%#!"