More Faith Fixups

Author: LT-Rascek

WtWSMS/common/on_action/BP_on_actions/000_BP_game_start_religion.txt

@@ -11,8 +11,10 @@ bp_game_start_religion = {
 		#Religious Stuff
 		override_vanilla_names
 		update_rite_doctrines_and_tenets
+		BP_set_religion_effects_by_date
 		convert_christian_chars_to_rites
 		swap_tenets_based_on_dlc
+		set_doctrines_by_date
 		#set_ethnic_religion_flags
 	}
 }
@@ -123,14 +125,17 @@ update_rite_doctrines_and_tenets = {
 		rite:theravada = {
 			change_rite_doctrine = special_doctrine_is_buddhist_faith
 			change_rite_doctrine = doctrine_theocracy_lay_clergy
+			change_rite_doctrine = doctrine_scriptural
 		}
 		rite:mahayana = {
 			change_rite_doctrine = special_doctrine_is_buddhist_faith
 			change_rite_doctrine = doctrine_theocracy_lay_clergy
+			change_rite_doctrine = doctrine_scriptural
 		}
 		rite:vajrayana = {
 			change_rite_doctrine = special_doctrine_is_buddhist_faith
 			change_rite_doctrine = doctrine_theocracy_lay_clergy
+			change_rite_doctrine = doctrine_scriptural
 		}
 		#christianity_religion
 		rite:apostolic_christianity = { set_rite_enabled = no }
@@ -289,11 +294,56 @@ update_rite_doctrines_and_tenets = {
 		#zoroastrianism_religion
 		rite:gayomarthianism = { set_rite_enabled = no }
 		rite:khurramism = { set_rite_enabled = no }
+		rite:afridunism = {
+			change_rite_doctrine = doctrine_mythic_literary
+			change_rite_doctrine = unreformed_faith_doctrine
+		}
 		#zunism_religion
 		rite:zun_pagan = { set_rite_enabled = no }
 	}
 }
 
+BP_set_religion_effects_by_date = {
+	effect = {
+		#Mazdakism as a strain of mainline Zoroastianism before Sukhra's death, so this is more Zaradushtism
+		#See Crone's "Kavad's Heresy and Mazdak's Revolt" for a thorough treatment
+		if = {
+			limit = { current_year < 493 }
+			rite:mazdakism = {
+				#Was less ascetic and more "life is to be enjoyed" (although "Hedonistic" might be too far)
+				change_rite_doctrine = doctrine_theocracy_temporal
+				change_rite_doctrine = doctrine_gender_male_dominated
+				change_rite_doctrine = doctrine_monogamy
+				change_rite_doctrine = doctrine_major_branch_dorustdin
+				change_rite_doctrine = doctrine_clerical_function_taxation
+				change_rite_doctrine = doctrine_ritual_vegetarianism_partial
+				change_rite_doctrine = doctrine_consanguinity_unrestricted #Mazdakism breaks without it
+				
+				remove_rite_tenet = tenet:tenet_asceticism
+				remove_rite_tenet = tenet:tenet_communal_possessions
+				remove_rite_tenet = tenet:tenet_pacifism
+				
+				add_rite_tenet = tenet:tenet_hedonistic
+				add_rite_tenet = tenet:tenet_communal_identity
+				add_rite_tenet = tenet:tenet_ritual_celebrations
+				
+				set_religious_head_title = title:d_mazdayasna
+				
+				this.faith = {
+					set_tenet_status = {
+						tenet = tenet:tenet_communal_possessions
+						status = unknown
+					}
+					set_tenet_status = {
+						tenet = tenet:tenet_pacifism
+						status = unknown
+					}
+				}
+			}
+		}
+	}
+}
+
 #Flips Nicene Chars to adopt the appropriate rites; should replace with full history rework
 convert_christian_chars_to_rites = {
 	effect = {
@@ -405,3 +455,12 @@ swap_tenets_based_on_dlc = {
 		}
 	}
 }
+
+set_doctrines_by_date = {
+	effect = {
+		if = {
+			limit = { current_year >= 410 }
+			faith:nestorian = { add_doctrine = special_doctrine_legalized_faith_persia }
+		}
+	}
+}

WtWSMS/common/on_action/BP_on_actions/BP_game_starts/BP_global_gamestart.txt

@@ -17,7 +17,6 @@ bp_global_setup = {
 		BP_update_culture_traditions_by_date
 		BP_set_culture_variables
 		BP_setup_realm_and_title_succession_laws_by_date
-		BP_set_religion_effects_by_date
 		BP_realm_capitals_by_date
 		BP_land_titles_by_date
 		BP_set_dynasty_names_by_date
@@ -170,38 +169,7 @@ BP_setup_realm_and_title_succession_laws_by_date = {
 		}
 	}
 }
-BP_set_religion_effects_by_date = {
-	effect = {
-		#Mazdakism as a strain of mainline Zoroastianism before Sukhra's death, so this is more Zaradushtism
-		#See Crone's "Kavad's Heresy and Mazdak's Revolt" for a thorough treatment
-		if = {
-			limit = { current_date <= 493.1.1 }
-			faith:mazdakism = {
-				#Was less ascetic and more "life is to be enjoyed" (although "Hedonistic" might be too far)
-				swap_doctrine_if_it_has_it_effect = {
-					OLD_DOCTRINE = tenet_asceticism
-					NEW_DOCTRINE = tenet_hedonistic
-				}
-				#Still priestly
-				swap_doctrine_if_it_has_it_effect = {
-					OLD_DOCTRINE = doctrine_theocracy_lay_clergy
-					NEW_DOCTRINE = doctrine_theocracy_temporal
-				}
-				#Male Dominated; more about not hoarding the women
-				swap_doctrine_if_it_has_it_effect = {
-					OLD_DOCTRINE = doctrine_gender_equal
-					NEW_DOCTRINE = doctrine_gender_male_dominated
-				}
-				#Still considered acceptable
-				swap_doctrine_if_it_has_it_effect = {
-					OLD_DOCTRINE = doctrine_heretic_branch_zandik
-					NEW_DOCTRINE = doctrine_major_branch_dorustdin
-				}
-				set_religious_head_title = title:d_mazdayasna
-			}
-		}
-	}
-}
+
 BP_realm_capitals_by_date = {
 	effect = {
 		#Capital changes for specific time periods

WtWSMS/common/religion/doctrine_category_types/00_doctrine_category_types.txt

@@ -3,31 +3,31 @@
 	sort_order = 8
 }
 
-special = {
+specific_to_religion = {
 	sort_order = 7
-	gui_tags = { special }
+	gui_tags = { religion_specific }
 }
 
-specific_to_religion = {
+marriage = {
 	sort_order = 6
-	gui_tags = { religion_specific }
 }
 
-marriage = {
+crimes = {
 	sort_order = 5
 }
 
-crimes = {
+clergy = {
 	sort_order = 4
 }
 
-clergy = {
+ritual = {
 	sort_order = 3
+	gui_tags = { ritual }
 }
 
-ritual = {
+special = {
 	sort_order = 2
-	gui_tags = { ritual }
+	gui_tags = { special }
 }
 
 not_creatable = {

WtWSMS/common/religion/doctrine_group_types/00_doctrine_group_types_BP_overwrite.txt

@@ -40,6 +40,7 @@ doctrine_theism = {
 
 doctrine_zoroastrian_branches = {
 	category = specific_to_religion
+	divergence = sequence
 	is_available_on_create = { religion_tag = zoroastrianism_religion }
 }
 

WtWSMS/common/religion/doctrine_group_types/BP_doctrine_group_types.txt

@@ -26,6 +26,16 @@ jewish_christian_linkage_group = {
 	doctrine_lock = religion
 	is_available_on_create = { religion_tag = judaism_religion }
 }
+#Zoroastrian
+legalized_faith_group = {
+	category = specific_to_religion
+	doctrine_lock = religion
+	is_available_on_create = { has_doctrine = special_doctrine_legalized_faith_persia }
+}
+is_zoroastrian_faith = {
+	category = special
+	is_available_on_create = { has_doctrine = special_doctrine_is_zoroastrian_faith }
+}
 #Dharmic
 sramana_special_doctrine_group = {
 	category = specific_to_religion

WtWSMS/common/religion/doctrine_types/20_doctrines_BP_overwrite.txt

@@ -460,7 +460,6 @@ doctrine_imperial_anointment = {
 	}
 }
 
-
 ##### Changed from Vanilla: Tied into baseline divergence values
 doctrine_canonical = {
 	doctrine_group_type = preservation

WtWSMS/common/religion/doctrine_types/20_doctrines_zoroastrian.txt

@@ -1,7 +1,10 @@
-##### Changed from Vanilla: Tied into new system for gradiations between Mainline Zoroastrianism and Zandik
+##### Changed from Vanilla: Tied into new system for gradations between Mainline Zoroastrianism and Zandik
 doctrine_major_branch_dorustdin = {
 	doctrine_group_type = doctrine_zoroastrian_branches
 	icon = "doctrine_major_branch_dorustdin"
+	
+	divergence = 0
+	
 	can_pick = {
 		custom_description = {
 			text = dorustdin_requires_you_follow_the_magi
@@ -25,13 +28,13 @@ doctrine_major_branch_dorustdin = {
 			NOR = {
 				# Either you're big on possessions but your HoF hates witchcraft...
 				AND = {
-					doctrine:tenet_adorcism = { is_in_list = selected_doctrines }
-					religious_head.faith = { has_doctrine = doctrine_witchcraft_crime }
+					tenet:tenet_adorcism = { is_in_list = selected_doctrines }
+					religious_head.faith.main_rite = { has_doctrine = doctrine_witchcraft_crime }
 				}
 				# ... or you hate witchcraft but your HoF likes possessions.
 				AND = {
 					doctrine:doctrine_witchcraft_crime = { is_in_list = selected_doctrines }
-					religious_head.faith = { has_doctrine = tenet_adorcism }
+					religious_head.faith.main_rite = { rite_has_tenet = tenet_adorcism }
 				}
 			}
 		}
@@ -44,7 +47,7 @@ doctrine_major_branch_dorustdin = {
 					doctrine:doctrine_polygamy = { is_in_list = selected_doctrines }
 				}
 				NOT = {
-					religious_head.faith = { has_doctrine = doctrine_monogamy }
+					religious_head.faith.main_rite = { rite_has_doctrine = doctrine_monogamy }
 				}
 			}
 		}
@@ -53,10 +56,8 @@ doctrine_major_branch_dorustdin = {
 			text = incompatible_tenet_shared_hof_world_vs_unrestricted_incest
 			# Non-incestual HoFs really take issue with unrestricted incest.
 			trigger_if = {
-				limit = {
-					doctrine:doctrine_consanguinity_unrestricted = { is_in_list = selected_doctrines }
-				}
-				religious_head.faith = { has_doctrine = doctrine_consanguinity_unrestricted }
+				limit = { doctrine:doctrine_consanguinity_unrestricted = { is_in_list = selected_doctrines } }
+				religious_head.faith.main_rite = { rite_has_doctrine = doctrine_consanguinity_unrestricted }
 			}
 		}
 
@@ -65,40 +66,40 @@ doctrine_major_branch_dorustdin = {
 		## Exaltation of Pain does not fit with mainstream Zoroastrianism
 		custom_description = {
 			text = incompatible_tenet_exaltation_of_pain_trigger
-			NOT = { doctrine:tenet_exaltation_of_pain = { is_in_list = selected_doctrines } }
+			NOT = { tenet:tenet_exaltation_of_pain = { is_in_list = selected_doctrines } }
 		}
 		## Human Sacrifice does not fit with mainstream Zoroastrianism
 		custom_description = {
 			text = incompatible_tenet_human_sacrifice_trigger
-			NOT = { doctrine:tenet_human_sacrifice = { is_in_list = selected_doctrines } }
+			NOT = { tenet:tenet_human_sacrifice = { is_in_list = selected_doctrines } }
 		}
 		## Human Sacrifice does not fit with mainstream Zoroastrianism
 		custom_description = {
 			text = incompatible_tenet_gruesome_festivals_trigger
-			NOT = { doctrine:tenet_gruesome_festivals = { is_in_list = selected_doctrines } }
+			NOT = { tenet:tenet_gruesome_festivals = { is_in_list = selected_doctrines } }
 		}
 		## Cannibalism does not fit with mainstream Zoroastrianism
 		custom_description = {
 			text = incompatible_tenet_ritual_cannibalism_trigger
-			NOT = { doctrine:tenet_ritual_cannibalism = { is_in_list = selected_doctrines } }
+			NOT = { tenet:tenet_ritual_cannibalism = { is_in_list = selected_doctrines } }
 		}
 
 		##### Dorustdin Specific Blockers
 		custom_description = { #No Pantheon anymore (Yaztas, but no Pantheon)
 			text = incompatible_tenet_bhakti_trigger
-			NOT = { doctrine:tenet_bhakti = { is_in_list = selected_doctrines } }
+			NOT = { tenet:tenet_bhakti = { is_in_list = selected_doctrines } }
 		}
 		custom_description = { #No Sun worship, only Orzmid
 			text = incompatible_tenet_sun_worship_trigger
-			NOT = { doctrine:tenet_sun_worship = { is_in_list = selected_doctrines } }
+			NOT = { tenet:tenet_sun_worship = { is_in_list = selected_doctrines } }
 		}
 		custom_description = {
 			text = incompatible_tenet_false_conversion_sanction_trigger
-			NOT = { doctrine:tenet_false_conversion_sanction = { is_in_list = selected_doctrines } }
+			NOT = { tenet:tenet_false_conversion_sanction = { is_in_list = selected_doctrines } }
 		}
 		custom_description = {
 			text = incompatible_tenet_sacred_shadows_trigger
-			NOT = { doctrine:tenet_sacred_shadows = { is_in_list = selected_doctrines } }
+			NOT = { tenet:tenet_sacred_shadows = { is_in_list = selected_doctrines } }
 		}
 
 		## Cannot pick a syncretism
@@ -140,6 +141,10 @@ doctrine_major_branch_dorustdin = {
 doctrine_major_branch_behdin = { ##### WtWSMS new
 	doctrine_group_type = doctrine_zoroastrian_branches
 	icon = "doctrine_major_branch_behdin"
+	
+	index = 1
+	divergence = 10
+	
 	piety_cost = {
 		value = faith_doctrine_cost_high
 		if = {
@@ -154,22 +159,22 @@ doctrine_major_branch_behdin = { ##### WtWSMS new
 		## Exaltation of Pain does not fit with mainstream Zoroastrianism
 		custom_description = {
 			text = incompatible_tenet_exaltation_of_pain_trigger
-			NOT = { doctrine:tenet_exaltation_of_pain = { is_in_list = selected_doctrines } }
+			NOT = { tenet:tenet_exaltation_of_pain = { is_in_list = selected_doctrines } }
 		}
 		## Human Sacrifice does not fit with mainstream Zoroastrianism
 		custom_description = {
 			text = incompatible_tenet_human_sacrifice_trigger
-			NOT = { doctrine:tenet_human_sacrifice = { is_in_list = selected_doctrines } }
+			NOT = { tenet:tenet_human_sacrifice = { is_in_list = selected_doctrines } }
 		}
 		## Human Sacrifice does not fit with mainstream Zoroastrianism
 		custom_description = {
 			text = incompatible_tenet_gruesome_festivals_trigger
-			NOT = { doctrine:tenet_gruesome_festivals = { is_in_list = selected_doctrines } }
+			NOT = { tenet:tenet_gruesome_festivals = { is_in_list = selected_doctrines } }
 		}
 		## Cannibalism does not fit with mainstream Zoroastrianism
 		custom_description = {
 			text = incompatible_tenet_ritual_cannibalism_trigger
-			NOT = { doctrine:tenet_ritual_cannibalism = { is_in_list = selected_doctrines } }
+			NOT = { tenet:tenet_ritual_cannibalism = { is_in_list = selected_doctrines } }
 		}
 	}
 
@@ -188,8 +193,8 @@ doctrine_major_branch_behdin = { ##### WtWSMS new
 }
 doctrine_heretic_branch_zandik = {
 	doctrine_group_type = doctrine_zoroastrian_branches
-	index = 1
-	divergence = 50
+	index = 2
+	divergence = 100
 
 	icon = "doctrine_heretic_branch_zandik"
 

WtWSMS/common/religion/doctrine_types/BP_doctrines_eastern.txt

@@ -83,7 +83,7 @@ special_doctrine_is_nastika_faith = {
 	}
 }
 special_doctrine_is_eastern_pagan_faith = {
-	doctrine_group_type = special_tolerance
+	doctrine_group_type = eastern_pagan_group
 	special_parameters = {
 		hostility_level_override = {
 			eastern_hostility_doctrine = astray