Merge branch 'next-version-dev' of https://forgejo.damimani-alex.org/damimani/N3OW into next-version-dev

common/religion/rite_types/NEOW_rites_chronicler.txt

@@ -62,5 +62,6 @@ osvicenist_rite = {
 	tenets = {
 		tenet_pursuit_of_knowledge
 		tenet_no_mind
+		tenet_inner_journey
 	}
 }

common/religion/rite_types/NEOW_rites_trenchsinger.txt

@@ -17,5 +17,7 @@
 
 	tenets = {
 		tenet_let_the_poppies_grow
+		tenet_peacekeeping
+		tenet_adaptive
 	}
 }

common/religion/tenet_types/00_NEOW_tenet_types.txt

@@ -375,7 +375,7 @@
 			value = faith_tenet_cost_low
 			# Multiplier for keeping same tenet
 			if = {
-				limit = { has_doctrine = core_tenet_peacekeeping }
+				limit = { has_doctrine = tenet_peacekeeping }
 				multiply = faith_unchanged_doctrine_cost_mult
 			}
 		}
@@ -875,7 +875,7 @@
 	}
 
 tenet_sacramental_herbs = {
-	icon = core_tenet_weed
+	icon = tenet_weed
 	piety_cost = {
 		value = faith_tenet_cost_mid
 		if = {
@@ -895,7 +895,7 @@ tenet_sacramental_herbs = {
 }
 
 tenet_militant_vows = {
-	icon = core_tenet_warrior_monks
+	icon = tenet_warrior_monks
 	piety_cost = {
 		value = faith_tenet_cost_low
 		if = {

common/religion/tenet_types/00_tenet_types.txt

@@ -203,19 +203,7 @@ tenet_alexandrian_catechism = {
 				}
 				desc = tenet_alexandrian_catechism_default_name
 			}
-			triggered_desc = {
-				trigger = {
-					OR = {
-						rite_religion_tag = catholic_religion
-						rite_religion_tag = eastern_orthodox_religion
-						rite_religion_tag = oriental_orthodox_religion
-						rite_religion_tag = protestant_religion
-					}
-					has_pam_dlc_trigger = no
-				}
-				desc = tenet_alexandrian_catechism_name
-			}
-			desc = tenet_islamic_rationalism_name
+			desc = tenet_alexandrian_catechism_name
 		}
 	}
 
@@ -247,16 +235,9 @@ tenet_alexandrian_catechism = {
 					pam_greek_as_liturgical_language_trigger = no
 					pam_latin_as_liturgical_language_trigger = no
 				}
-				desc = tenet_alexandrian_catechism_default_desc
-			}
-			triggered_desc = {
-				trigger = {
-					faith = { OR = { religion = religion:eastern_orthodox_religion religion = religion:oriental_orthodox_religion } }
-					has_pam_dlc_trigger = no
-				}
 				desc = tenet_alexandrian_catechism_desc
 			}
-			desc = tenet_islamic_rationalism_desc
+			desc = tenet_alexandrian_catechism_desc
 		}
 	}
 
@@ -2669,7 +2650,13 @@ tenet_struggle_submission = {
 
 	historical_glossary = {
 		first_valid = {
-			desc = tenet_struggle_submission_jihad_historical_glossary
+			triggered_desc = {
+				trigger = {
+					rite_religion_tag = islam_religion
+				}
+				desc = tenet_struggle_submission_jihad_historical_glossary
+			}
+			desc = tenet_struggle_submission_historical_glossary
 		}
 	}
 
@@ -2691,9 +2678,9 @@ tenet_struggle_submission = {
 		}
 	}
 
-	can_pick = {
-		religion = religion:islam_religion
-	}
+#	can_pick = {
+#		religion = religion:islam_religion
+#	}
 
 	parameters = {
 		great_holy_wars_active
@@ -5487,20 +5474,14 @@ tenet_fp3_fedayeen = {
 	icon = tenet_assassin
 
 	historical_glossary = {
-		first_valid = {
-			desc = tenet_fp3_fedayeen_historical_glossary
-		}
-	}
-
-	name = {
 		first_valid = {
 			triggered_desc = {
 				trigger = {
 					rite_religion_tag = islam_religion
 				}
-				desc = tenet_fp3_fedayeen_name
+				desc = tenet_fp3_fedayeen_historical_glossary
 			}
-			desc = tenet_fp3_sacred_murder_name
+			desc = tenet_fp3_sacred_murder_historical_glossary
 		}
 	}
 

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

@@ -80,7 +80,6 @@
   tenet_esotericism_kabbalah_historical_desc: "Kabbalah is a body of Jewish mystical and esoteric teaching concerned with God, creation, revelation, the divine attributes or sefirot, and the deeper meaning of the Torah. Major medieval expressions developed in Provence and Spain. Jewish Kabbalah should be distinguished from later Christian Cabala and Hermetic Qabalah, which adapted some of its ideas within different intellectual and religious systems."
   tenet_esotericism_kabbalah_desc:0 "Through the received teachings of Kabbalah, we contemplate the hidden meanings of the Torah, the mystery of Ein Sof, and the relationship between God and creation. This venerable current of Jewish mysticism deepens our understanding of divine wisdom and sacred tradition."
   tenet_monasticism_desc:0 "By renouncing worldly distractions, practicing prayer, fasting, and obedience, we devote ourselves more fully to the divine. Whether in solitude or in the common life of a monastery, discipline and humility lead us toward holiness."
-  tenet_alexandrian_catechism_desc:0 "The Catechetical School of Alexandria cultivated the study of Scripture, philosophy, and Christian doctrine. Its teachers sought deeper understanding while defending the faith; even as its institutions changed over the centuries, their tradition of theological learning endured."
   doctrine_parameter_adoptionists_are_unilateral_hostile: "Other Christian [faiths|E] only consider them $hostility_hostile_tooltippable$, whereas less refined $adoptionist_adherent_plural$ are considered $hostility_evil_tooltippable$"
   doctrine_parameter_adoptionists_are_unilateral_evil: "Other Christian [faiths|E] consider them $hostility_evil_tooltippable$"
   doctrine_parameter_adoptionists_are_mutual_evil: "Considers, and is considered by, all other Christian [faiths|E] to be $hostility_evil_tooltippable$"

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

@@ -1,5 +1,28 @@
 l_english:
 
+ ### Fixing vanilla tenets ###
+ 
+ # Sacred Murder
+ tenet_fp3_fedayeen_name: "Sacred Murder"
+ tenet_fp3_fedayeen_desc: "When ordinary warfare will not avail, it is our duty before [ROOT.Rite.GetFaith.HighGodNameAlternate] to destroy [ROOT.Rite.GetFaith.HighGodHerHis|U] enemies through infiltration and deception. We must fear neither death nor pain, and eagerly lay down our lives for the greater cause." 
+ tenet_fp3_fedayeen_historical_glossary: "[Glossary('Fedayeen','tenet_fp3_sacred_murder_historical_desc')]"
+ tenet_fp3_sacred_murder_historical_glossary: "[Glossary('Assassins','tenet_fp3_sacred_murder_historical_desc')]"
+ tenet_fp3_sacred_murder_historical_desc: "Inspired by the ruthlessness of some old world movements, the assassination of enemy rulers and clergy is not an infrequent tactic found in the more defensive faiths of the new millennium."
+ 
+ # Struggle and Submission
+ tenet_struggle_submission_jihad_historical_glossary: "[Glossary('Jihād','tenet_struggle_submission_historical_desc')]"
+ tenet_struggle_submission_jihad_historical_desc: "Moral, spiritual, and physical effort within the faith. Combat in self-defense is permitted under religious authority and legal rules within the faith."
+ tenet_struggle_submission_historical_glossary: "[Glossary('Struggle','tenet_struggle_submission_historical_desc')]"
+ 
+ # Alexandrian Catechism
+ tenet_alexandrian_catechism_name:0 "Catechism"
+ tenet_alexandrian_catechism_desc:0 "Catechism is the tradition of teaching children and converts the principles and doctrines of faith, allowing people from all walks of life a greater understanding of the beliefs that surround them."
+ tenet_alexandrian_catechism_historical_desc: "Catechism is the tradition of teaching children and converts the principles and doctrines of faith, allowing people from all walks of life a greater understanding of the beliefs that surround them."
+
+ 
+ ################################
+ 
+ 
   ### RIGHTEOUS FURY ###
  tenet_righteous_fury_name:0 "Righteous Fury"
  tenet_righteous_fury_desc:0 "It is our holy duty to ride forth against the forces of [ROOT.Faith.DevilName], and burn them and their temples down to the foundation."
@@ -130,8 +153,6 @@
  rf_antediluvianist:0 "Antediluvianist"
  rf_iranic:0 "Iranic"
  rf_esoteric:0 "Esoteric"
- tenet_islamic_rationalism_name: "$tenet_alexandrian_catechism_name$"
- tenet_islamic_rationalism_desc: "$tenet_alexandrian_catechism_desc$"
  tenet_takamin_name: "Bear Worship"
  tenet_takamin_desc: "Believing bears as manifestations of gods, the sanctity of these animals must be respected, and the killing of one during hunts should be done with utmost respect."
  tenet_love_under_will_name:0 "Love Under Will"
@@ -289,8 +310,8 @@
  core_tenet_belle_epoque_name:0 "Belle Époque"
  core_tenet_belle_epoque_desc:0 "Though the end of unified Europe permeates throughout the lands to this very day, we will go through great efforts to reunite the continent. Not through war, but through words."
 
- core_tenet_peacekeeping_name:0 "Peacekeeping"
- core_tenet_peacekeeping_desc:0 "Staying away from violence on a personal level is not enough. We must intervene to keep the peace all throughout the world in order to help humanity defeat its greatest vice."
+ tenet_peacekeeping_name:0 "Peacekeeping"
+ tenet_peacekeeping_desc:0 "Staying away from violence on a personal level is not enough. We must intervene to keep the peace all throughout the world in order to help humanity defeat its greatest vice."
 
  tenet_let_the_poppies_grow_name:0 "Let the Poppies Grow"
  tenet_let_the_poppies_grow_desc:0 "The old battlefields lie restless to this day, dampened with the bodies of countless men and their instruments of death. We must safeguard these lands from unwary travellers, both for their own good and to let the dead lie."