Merge branch 'main' of https://gitlab.com/new-era-team/N3OW

common/religion/doctrines/00_1_neow_universal_tolerance_doctrines.txt

@@ -496,6 +496,7 @@
 			hostility_override_special_doctrine_people_of_the_book = 2
 
 			loc_parameter_fae_and_folklore_astray = 1
+			loc_parameter_fae_and_folklore_hostile = 2
 		}
 	}
 
@@ -778,10 +779,13 @@
 			}
 		}
 		parameters = {
-			hostility_override_special_doctrine_loyal_servants_of_the_queen = 3
 			hostility_override_special_doctrine_regicidal = 0
+
+			hostility_override_special_doctrine_loyal_servants_of_the_queen = 3
 			hostility_override_special_doctrine_true_servants_of_the_queen = 3
-			hostility_override_special_doctrine_true_servants_of_the_queen_regents = 3				
+			hostility_override_special_doctrine_true_servants_of_the_queen_regents = 3
+			
+			loc_parameter_is_regicidal = yes
 		}
 	}	
 

localization/english/replace/religion/doctrines/zz_NEOW_religion_tolerance doctrines_l_english.yml

@@ -71,6 +71,7 @@
 
  doctrine_parameter_loc_parameter_people_of_the_book_astray:0 "$click_here_to_view_doctrines$ [people_of_the_book_astray|L] considers to be Astray"
  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_goddesses_and_glory_astray:0 "$click_here_to_view_doctrines$ [goddesses_and_glory_astray|L] considers to be Astray"
  doctrine_parameter_loc_parameter_via_media_astray:0 "$click_here_to_view_doctrines$ [via_media_astray|L] considers to be Astray"
@@ -78,6 +79,7 @@
  #Other parameters
  doctrine_parameter_loc_parameter_novelist_kinship: "Other Novelist [faiths|E] that have Kinship doctrines are considered [GetHostilityLevelName( TOKEN_PARAMETER.GetIntValue )|V] instead of $hostility_astray_tooltippable$"
  doctrine_parameter_loc_parameter_via_media: "Other Christian [faiths|E] that have the Via Media doctrine are considered [GetHostilityLevelName( TOKEN_PARAMETER.GetIntValue )|V] instead of $hostility_hostile_tooltippable$ or $hostility_evil_tooltippable$."
+ doctrine_parameter_loc_parameter_is_regicidal: "Considers all servants of the British Monarchy to be $hostility_evil_tooltippable$ and those sharing their anti-Imperial cause to be $hostility_righteous_tooltippable$"
 
  doctrine_parameter_hostility_override_tenet_christian_syncretism:3 "Non-Christian [faiths|E] with the $tenet_christian_syncretism_name$ tenet are considered [GetHostilityLevelName( TOKEN_PARAMETER.GetIntValue )|V]"
 
@@ -113,8 +115,10 @@
  doctrine_parameter_hostility_override_special_doctrine_fae_and_folklore:0 ""
  doctrine_parameter_hostility_override_special_doctrine_might_and_magick:0 ""
  doctrine_parameter_hostility_override_special_doctrine_goddesses_and_glory: ""
-
  doctrine_parameter_hostility_override_special_doctrine_via_media:0 ""
+
  doctrine_parameter_hostility_override_special_doctrine_true_servants_of_the_queen:0 ""
  doctrine_parameter_hostility_override_special_doctrine_via_media:0 ""
  doctrine_parameter_hostility_override_special_doctrine_regicidal:0 ""
+ doctrine_parameter_hostility_override_special_doctrine_true_servants_of_the_queen:0 ""
+

localization/english/replace/religion/doctrines/zz_NEOW_tolerance_game_concepts_l_english.yml

@@ -1,9 +1,9 @@
 l_english:
 
  game_concept_template_astray: "put name here"
- game_concept_template_astray_desc: "[faiths|E] with the name here doctrine consider faiths with the following doctrines to be $hostility_astray_tooltippable$:\n"
+ game_concept_template_astray_desc: "[faiths|E] with the name here doctrine consider faiths with the following doctrines to be $hostility_astray_tooltippable$:\n#true_white [GetFaithDoctrine('special_doctrine_SAME_RELIGION_ASTRAY').GetBaseName]#!\n#true_white;game_link $special_doctrine_THIS DOCTRINE$#!\n#bold $A DIFFERENT_religion$:#!\n#true_white [GetFaithDoctrine('special_doctrine_DIFFERENT_ASTRAY').GetBaseName]#!"
  game_concept_template_hostile: "put name here"
- game_concept_template_hostile_desc: "[faiths|E] with the name here doctrine consider faiths with the following doctrines to be $hostility_hostile_tooltippable$:\n"
+ game_concept_template_hostile_desc: "[faiths|E] with the name here doctrine consider faiths with the following doctrines to be $hostility_hostile_tooltippable$:\n#true_white [GetFaithDoctrine('special_doctrine_SAME_HOSTILE').GetBaseName]#!\n#bold $A DIFFERENT_religion$:#!\n#true_white [GetFaithDoctrine('special_doctrine_DIFFERENT_HOSTILE').GetBaseName]#!"
 
  interreligious_doctrines: "Interreligious"
 
@@ -73,7 +73,10 @@
  #Wicca/Druidic
 
  game_concept_fae_and_folklore_astray: "$special_doctrine_fae_and_folklore_name$"
- game_concept_fae_and_folklore_astray_desc: "[faiths|E] with the $special_doctrine_fae_and_folklore_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_fae_and_folklore_astray_desc: "[faiths|E] with the $special_doctrine_fae_and_folklore_name$ doctrine consider faiths with the following doctrines to be $hostility_astray_tooltippable$:\n#true_white;game_link $special_doctrine_fae_and_folklore_name$#!\n#true_white [GetFaithDoctrine('special_doctrine_might_and_magick').GetBaseName]#!\n#true_white [GetFaithDoctrine('special_doctrine_goddesses_and_glory').GetBaseName]#!\n#bold $novelist_religion$:#!\n#true_white [GetFaithDoctrine('special_doctrine_fantastical_kinship').GetBaseName]#!"
+
+ game_concept_fae_and_folklore_hostile: "$special_doctrine_fae_and_folklore_name$"
+ 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]#!"