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

common/bookmarks/bookmarks/00_bookmarks.txt

@@ -104,11 +104,11 @@
 		dynasty_splendor_level = 2
 		type = male
 		birth = 2513.1.1
-		title = d_munster
+		title = k_ireland
 		government = feudal_government
 		culture = high_irish
 		religion = "celtic"
-		difficluty = "BOOKMARK_CHARACTER_DIFFICULTY_HARD"
+		difficluty = "BOOKMARK_CHARACTER_DIFFICULTY_MEDIUM"
 		history_id = britannia_colbrugha_michael
 		position = { 270 190 }
 		animation = idle

common/council_tasks/00_court_chaplain_tasks.txt

@@ -340,25 +340,12 @@ task_conversion = {
 			limit = {
 				exists = scope:county.faith
 				scope:county.faith = {
-					fervor > 80
-				}
-			}
-			multiply = {
-				value = 0.2
-				desc = STEWARD_CONVERT_FAITH_ZEALOT_FERVOUR_PENALTY
-			}
-		}
-		if = { # Development reduces the speed. Should be the last non-multiply modifier applied to avoid negative values
-			limit = {
-				exists = scope:county.faith
-				scope:county.faith = {
-					fervor <= 80
 					fervor > 60
 				}
 			}
 			multiply = {
-				value = 0.4
-				desc = STEWARD_CONVERT_FAITH_HIGH_FERVOUR_PENALTY
+				value = 0.7
+				desc = STEWARD_CONVERT_FAITH_ZEALOT_FERVOUR_PENALTY
 			}
 		}
 		if = { # Development reduces the speed. Should be the last non-multiply modifier applied to avoid negative values
@@ -370,8 +357,8 @@ task_conversion = {
 				}
 			}
 			multiply = {
-				value = 0.6
-				desc = STEWARD_PROMOTE_FAITH_MEDIUM_FERVOUR_PENALTY
+				value = 0.8
+				desc = STEWARD_CONVERT_FAITH_HIGH_FERVOUR_PENALTY
 			}
 		}
 		if = { # Development reduces the speed. Should be the last non-multiply modifier applied to avoid negative values
@@ -383,7 +370,20 @@ task_conversion = {
 				}
 			}
 			multiply = {
-				value = 0.8
+				value = 0.9
+				desc = STEWARD_PROMOTE_FAITH_MEDIUM_FERVOUR_PENALTY
+			}
+		}
+		if = { # Development reduces the speed. Should be the last non-multiply modifier applied to avoid negative values
+			limit = {
+				exists = scope:county.faith
+				scope:county.faith = {
+					fervor <= 20
+					fervor > 0
+				}
+			}
+			multiply = {
+				value = 1.2
 				desc = STEWARD_PROMOTE_CULTURE_LOW_FERVOUR_PENALTY
 			}
 		}
@@ -396,7 +396,7 @@ task_conversion = {
 				}
 			}
 			multiply = {
-				value = 1.2
+				value = 1.4
 				desc = STEWARD_PROMOTE_CULTURE_LOW_FERVOUR_BONUS
 			}
 		}
@@ -410,7 +410,7 @@ task_conversion = {
 				}
 			}
 			multiply = {
-				value = 0.5
+				value = 0.8
 				desc = STEWARD_PROMOTE_CULTURE_LOW_CONTROL_PENALTY
 			}
 		}
@@ -423,7 +423,7 @@ task_conversion = {
 				}
 			}
 			multiply = {
-				value = 0.7
+				value = 0.9
 				desc = STEWARD_PROMOTE_CULTURE_MEDIUM_CONTROL_PENALTY
 			}
 		}
@@ -436,7 +436,7 @@ task_conversion = {
 				}
 			}
 			multiply = {
-				value = 0.9
+				value = 1.1
 				desc = STEWARD_PROMOTE_CULTURE_HIGH_CONTROL_PENALTY
 			}
 		}
@@ -448,7 +448,7 @@ task_conversion = {
 				}
 			}
 			multiply = {
-				value = 1.1
+				value = 1.2
 				desc = STEWARD_PROMOTE_CULTURE_HIGH_CONTROL_BONUS
 			}
 		}
@@ -461,7 +461,7 @@ task_conversion = {
 				}
 			}
 			multiply = {
-				value = 1.3
+				value = 1.4
 				desc = STEWARD_PROMOTE_CULTURE_HIGH_CONTROL_BONUS
 			}
 		}
@@ -473,7 +473,7 @@ task_conversion = {
 				}
 			}
 			multiply = {
-				value = 1.5
+				value = 1.6
 				desc = STEWARD_PROMOTE_CULTURE_ABSOLUTE_CONTROL_BONUS
 			}
 		}
@@ -493,7 +493,7 @@ task_conversion = {
 				}
 			}
 			multiply = {
-				value = 0.6
+				value = 0.8
 				desc = STEWARD_PROMOTE_CULTURE_HIGH_TERRAIN_PENALTY
 			}
 		}
@@ -512,7 +512,7 @@ task_conversion = {
 				}
 			}
 			multiply = {
-				value = 0.8
+				value = 0.9
 				desc = STEWARD_PROMOTE_CULTURE_LOW_TERRAIN_PENALTY
 			}
 		}

common/religion/doctrines/30_core_tenets.txt

@@ -926,8 +926,8 @@
 			}
 		}
 
-		is_shown = {
-			religion_tag = novelist_religion
+		can_pick = {
+			always = yes
 		}	
 		
 		character_modifier = {
@@ -1091,7 +1091,7 @@
 				multiply = faith_unchanged_doctrine_cost_mult
 			}
 		}
-
+		
 		is_shown = {
 			OR = {
 				religion_tag = hermetic_religion 
@@ -1106,7 +1106,7 @@
 		}
 
 		character_modifier = {
-			monthly_learning_lifestyle_xp_gain_mult = 0.2
+			monthly_learning_lifestyle_xp_gain_mult = 0.1
 			learning_per_stress_level = 2
 		}
 
@@ -1185,6 +1185,35 @@
 			}
 		}
 	}
+	
+	tenet_divine_progress = {
+		icon = core_tenet_divine_progress
+
+		piety_cost = {
+			value = faith_tenet_cost_low
+			# Multiplier for keeping same tenet
+			if = {
+				limit = { has_doctrine = tenet_divine_progress  }
+				multiply = faith_unchanged_doctrine_cost_mult
+			}
+		}
+
+		can_pick = {
+			always = yes
+		}
+
+		character_modifier = {
+			monthly_learning_lifestyle_xp_gain_mult = 0.1
+		}
+
+		traits = {
+			virtues = { ambitious }
+			sins = { content }
+		}
+		parameters = {
+			neow_innovation_from_learning_traits = yes
+		}
+	}
 
 	##### CALVINIST ######
 

common/religion/religions/NEOW_novelist.txt

@@ -914,7 +914,7 @@
 			doctrine = special_doctrine_singular_interpretation
 
 			#Tenets
-			doctrine = tenet_esotericism
+			doctrine = tenet_divine_progress
 			doctrine = tenet_inner_journey
 			doctrine = tenet_scientific_discourse
 

common/religion/religions/NEOW_resurgentist.txt

@@ -314,7 +314,7 @@
 
 			#Tenets | placeholder
 			doctrine = tenet_warmonger
-			doctrine = tenet_aniconism
+			doctrine = tenet_divine_progress
 			doctrine = tenet_communal_possessions
 
 			holy_order_names = { #placeholder