diff --git a/common/religion/doctrines/00_1_neow_universal_tolerance_doctrines.txt b/common/religion/doctrines/00_1_neow_universal_tolerance_doctrines.txt index 54658c85..05455ce5 100644 --- a/common/religion/doctrines/00_1_neow_universal_tolerance_doctrines.txt +++ b/common/religion/doctrines/00_1_neow_universal_tolerance_doctrines.txt @@ -606,7 +606,7 @@ hostility_override_special_doctrine_fae_and_folklore = 1 hostility_override_special_doctrine_might_and_magick = 1 hostility_override_special_doctrine_goddesses_and_glory = 1 - hostility_override_special_doctrine_loyal_servants_of_the_queen_thelema = 1 + hostility_override_special_doctrine_loyal_servants_of_the_queen = 1 hostility_override_special_doctrine_academic_kinship = 1 hostility_override_special_doctrine_fantastical_kinship = 1 @@ -616,6 +616,7 @@ hostility_override_special_doctrine_people_of_the_book = 2 loc_parameter_might_and_magick_astray = 1 + loc_parameter_might_and_magick_hostile = 2 } } @@ -646,6 +647,7 @@ hostility_override_special_doctrine_people_of_the_book = 2 loc_parameter_goddesses_and_glory_astray = 1 + loc_parameter_goddesses_and_glory_hostile = 2 } } @@ -753,34 +755,13 @@ } ####Britanic and Thelema Doctrine#### - - special_doctrine_loyal_servants_of_the_queen_thelema = { - is_shown = { - religion_tag = thelema_religion - } - piety_cost = { - value = faith_doctrine_cost_low - if = { - limit = { has_doctrine = special_doctrine_loyal_servants_of_the_queen_thelema } - multiply = faith_unchanged_tolerance_doctrine_cost_mult - } - } - parameters = { - hostility_override_special_doctrine_loyal_servants_of_the_queen = 0 - hostility_override_special_doctrine_true_servants_of_the_queen = 2 - hostility_override_special_doctrine_regicidal = 3 - hostility_override_special_doctrine_true_servants_of_the_queen_regents = 3 - - hostility_override_special_doctrine_might_and_magick = 1 - hostility_override_special_doctrine_goddesses_and_glory = 1 - hostility_override_special_doctrine_fae_and_folklore = 2 - - } - } special_doctrine_loyal_servants_of_the_queen = { is_shown = { - religion_tag = brittanic_religion + OR = { + religion_tag = brittanic_religion + religion_tag = thelema_religion + } } piety_cost = { value = faith_doctrine_cost_low @@ -791,7 +772,6 @@ } parameters = { hostility_override_special_doctrine_loyal_servants_of_the_queen = 0 - hostility_override_special_doctrine_loyal_servants_of_the_queen_thelema = 0 hostility_override_special_doctrine_true_servants_of_the_queen = 0 hostility_override_special_doctrine_regicidal = 3 hostility_override_special_doctrine_true_servants_of_the_queen_regents = 3 @@ -818,7 +798,6 @@ } parameters = { hostility_override_special_doctrine_loyal_servants_of_the_queen = 0 - hostility_override_special_doctrine_loyal_servants_of_the_queen_thelema = 2 hostility_override_special_doctrine_true_servants_of_the_queen = 0 hostility_override_special_doctrine_regicidal = 3 hostility_override_special_doctrine_true_servants_of_the_queen_regents = 3 @@ -844,7 +823,6 @@ } parameters = { hostility_override_special_doctrine_loyal_servants_of_the_queen = 3 - hostility_override_special_doctrine_loyal_servants_of_the_queen_thelema = 3 hostility_override_special_doctrine_true_servants_of_the_queen = 3 hostility_override_special_doctrine_regicidal = 3 hostility_override_special_doctrine_true_servants_of_the_queen_regents = 3 @@ -890,26 +868,23 @@ } } parameters = { - hostility_override_special_doctrine_loyal_servants_of_the_queen_thelema = 2 - hostility_override_special_doctrine_might_and_magick = 1 hostility_override_special_doctrine_goddesses_and_glory = 1 - hostility_override_special_doctrine_fae_and_folklore = 2 hostility_override_special_doctrine_roman_rite = 1 - hostility_override_special_doctrine_independent_catholic = 0 + hostility_override_special_doctrine_independent_catholic = 1 + hostility_override_special_doctrine_sevillian_rite = 1 hostility_override_special_doctrine_established_church = 1 + hostility_override_special_doctrine_reformation_roots = 1 hostility_override_special_doctrine_via_media = 1 - hostility_override_special_doctrine_sevillian_rite = 1 - hostility_override_special_doctrine_christian_kinship = 1 - hostility_override_special_doctrine_reformation_roots = 1 + hostility_override_special_doctrine_fae_and_folklore = 2 - hostility_override_special_doctrine_incorruptible_dogma = 2 + hostility_override_special_doctrine_loyal_servants_of_the_queen = 2 } } special_doctrine_nobelian_hermetic = { @@ -924,8 +899,6 @@ } } parameters = { - hostility_override_special_doctrine_loyal_servants_of_the_queen_thelema = 2 - hostility_override_special_doctrine_might_and_magick = 1 hostility_override_special_doctrine_goddesses_and_glory = 1 hostility_override_special_doctrine_fae_and_folklore = 3 @@ -937,13 +910,13 @@ hostility_override_special_doctrine_via_media = 1 - hostility_override_special_doctrine_sevillian_rite = 0 + hostility_override_special_doctrine_sevillian_rite = 1 hostility_override_special_doctrine_christian_kinship = 1 hostility_override_special_doctrine_reformation_roots = 1 - hostility_override_special_doctrine_incorruptible_dogma = 3 + hostility_override_special_doctrine_loyal_servants_of_the_queen = 2 } } ####German/Adonist Doctrine#### Adonist should hate the christians(everyone kinda tbh), and deists. germanpagan probably dont need aything too fancy, cept maybe the folktero being astray with christians @@ -962,7 +935,7 @@ } } parameters = { - hostility_override_special_doctrine_loyal_servants_of_the_queen_thelema = 2 + hostility_override_special_doctrine_loyal_servants_of_the_queen = 2 hostility_override_special_doctrine_might_and_magick = 1 hostility_override_special_doctrine_goddesses_and_glory = 1 diff --git a/localization/english/replace/religion/doctrines/zz_NEOW_religion_tolerance doctrines_l_english.yml b/localization/english/replace/religion/doctrines/zz_NEOW_religion_tolerance doctrines_l_english.yml index ce046392..aeb0cb17 100644 --- a/localization/english/replace/religion/doctrines/zz_NEOW_religion_tolerance doctrines_l_english.yml +++ b/localization/english/replace/religion/doctrines/zz_NEOW_religion_tolerance doctrines_l_english.yml @@ -120,7 +120,9 @@ doctrine_parameter_loc_parameter_fae_and_folklore_astray:0 "$click_here_to_view_doctrines$ [fae_and_folklore_astray|L] considers to be Astray" doctrine_parameter_loc_parameter_fae_and_folklore_hostile:0 "$click_here_to_view_doctrines$ [fae_and_folklore_hostile|L] considers to be Hostile" doctrine_parameter_loc_parameter_might_and_magick_astray:0 "$click_here_to_view_doctrines$ [might_and_magick_astray|L] considers to be Astray" + doctrine_parameter_loc_parameter_might_and_magick_hostile:0 "$click_here_to_view_doctrines$ [might_and_magick_hostile|L] considers to be Hostile" doctrine_parameter_loc_parameter_goddesses_and_glory_astray:0 "$click_here_to_view_doctrines$ [goddesses_and_glory_astray|L] considers to be Astray" + doctrine_parameter_loc_parameter_goddesses_and_glory_hostile:0 "$click_here_to_view_doctrines$ [goddesses_and_glory_hostile|L] considers to be Hostile" doctrine_parameter_loc_parameter_via_media_astray:0 "$click_here_to_view_doctrines$ [via_media_astray|L] considers to be Astray" doctrine_parameter_loc_parameter_cult_of_saints_astray:0 "$click_here_to_view_doctrines$ [cult_of_saints_astray|L] considers to be Astray" @@ -156,12 +158,9 @@ doctrine_parameter_hostility_override_special_doctrine_reformation_roots:0 "" doctrine_parameter_hostility_override_special_doctrine_loyal_servants_of_the_queen:0 "" - doctrine_parameter_hostility_override_special_doctrine_loyal_servants_of_the_queen_thelema:0 "" doctrine_parameter_hostility_override_special_doctrine_true_servants_of_the_queen_regents:0 "" doctrine_parameter_hostility_override_special_doctrine_true_servants_of_the_queen:0 "" - doctrine_parameter_hostility_override_special_doctrine_loyal_servants_of_the_queen_thelema: "" - doctrine_parameter_hostility_override_special_doctrine_radical_reform:0 "" doctrine_parameter_hostility_override_special_doctrine_incorruptible_dogma:0 "" doctrine_parameter_hostility_override_special_doctrine_singular_interpretation: "" diff --git a/localization/english/replace/religion/doctrines/zz_NEOW_tolerance_game_concepts_l_english.yml b/localization/english/replace/religion/doctrines/zz_NEOW_tolerance_game_concepts_l_english.yml index b3a93fed..154b54de 100644 --- a/localization/english/replace/religion/doctrines/zz_NEOW_tolerance_game_concepts_l_english.yml +++ b/localization/english/replace/religion/doctrines/zz_NEOW_tolerance_game_concepts_l_english.yml @@ -99,10 +99,16 @@ game_concept_fae_and_folklore_hostile_desc: "[faiths|E] with the $special_doctrine_fae_and_folklore_name$ doctrine consider faiths with the following doctrines to be $hostility_hostile_tooltippable$:\n#bold $novelist_religion$:#!\n#true_white [GetFaithDoctrine('special_doctrine_academic_kinship').GetBaseName]#!\n#true_white [GetFaithDoctrine('special_doctrine_christian_kinship').GetBaseName]#!\n#true_white [GetFaithDoctrine('special_doctrine_islamic_kinship').GetBaseName]#!" game_concept_might_and_magick_astray: "$special_doctrine_might_and_magick_name$" - game_concept_might_and_magick_astray_desc: "[faiths|E] with the $special_doctrine_might_and_magick_name$ doctrine consider faiths with the following doctrines to be $hostility_astray_tooltippable$:\n#true_white;game_link $special_doctrine_people_of_the_book_name$#!\n#bold $novelist_religion$:#!\n#true_white [novelist_kinship_doctrines|L]#!" + game_concept_might_and_magick_astray_desc: "[faiths|E] with the $special_doctrine_might_and_magick_name$ doctrine consider faiths with the following doctrines to be $hostility_astray_tooltippable$:\n#true_white [GetFaithDoctrine('special_doctrine_fae_and_folklore').GetBaseName]#!\n#true_white;game_link $special_doctrine_might_and_magick_name$#!\n#true_white [GetFaithDoctrine('special_doctrine_goddesses_and_glory').GetBaseName]#!\n#bold $novelist_religion$:#!\n#true_white [GetFaithDoctrine('special_doctrine_fantastical_kinship').GetBaseName]#!\n#true_white [GetFaithDoctrine('special_doctrine_academic_kinship').GetBaseName]#!" + + game_concept_might_and_magick_hostile: "$special_doctrine_might_and_magick_name$" + game_concept_might_and_magick_hostile_desc: "[faiths|E] with the $special_doctrine_might_and_magick_name$ doctrine consider faiths with the following doctrines to be $hostility_hostile_tooltippable$:\n#true_white;game_link $special_doctrine_people_of_the_book_name$#!\n#bold $novelist_religion$:#!\n#true_white [GetFaithDoctrine('special_doctrine_christian_kinship').GetBaseName]#!\n#true_white [GetFaithDoctrine('special_doctrine_islamic_kinship').GetBaseName]#!" game_concept_goddesses_and_glory_astray: "$special_doctrine_goddesses_and_glory_name$" - game_concept_goddesses_and_glory_astray_desc: "[faiths|E] with the $special_doctrine_goddesses_and_glory_name$ doctrine consider faiths with the following doctrines to be $hostility_astray_tooltippable$:\n#true_white;game_link $special_doctrine_people_of_the_book_name$#!\n#bold $novelist_religion$:#!\n#true_white [novelist_kinship_doctrines|L]#!" + game_concept_goddesses_and_glory_astray_desc: "[faiths|E] with the $special_doctrine_goddesses_and_glory_name$ doctrine consider faiths with the following doctrines to be $hostility_astray_tooltippable$:\n#true_white [GetFaithDoctrine('special_doctrine_fae_and_folklore').GetBaseName]#!\n#true_white [GetFaithDoctrine('special_doctrine_might_and_magick').GetBaseName]#!\n#true_white;game_link $special_doctrine_goddesses_and_glory_name$#!\n#bold $novelist_religion$:#!\n#true_white [GetFaithDoctrine('special_doctrine_fantastical_kinship').GetBaseName]#!\n#true_white [GetFaithDoctrine('special_doctrine_academic_kinship').GetBaseName]#!" + + game_concept_goddesses_and_glory_hostile: "$special_doctrine_goddesses_and_glory_name$" + game_concept_goddesses_and_glory_hostile_desc: "[faiths|E] with the $special_doctrine_goddesses_and_glory_name$ doctrine consider faiths with the following doctrines to be $hostility_hostile_tooltippable$:\n#true_white;game_link $special_doctrine_people_of_the_book_name$#!\n#bold $novelist_religion$:#!\n#true_white [GetFaithDoctrine('special_doctrine_christian_kinship').GetBaseName]#!\n#true_white [GetFaithDoctrine('special_doctrine_islamic_kinship').GetBaseName]#!" #Anglican