Merge decisions from 2.4.5 to 2.5.2 #1

MOD/Witcher/common/governments/nomadic_governments.txt

@@ -11,7 +11,6 @@ nomadic_governments = {
 		}
 		forced_contract = {
 			feudal_government
-			muslim_government
 			theocracy_government
 			merchant_republic_government
 			republic_government

MOD/Witcher/common/governments/theocracy_governments.txt

@@ -15,7 +15,6 @@ theocracy_governments = {
 		}
 		accepts_liege_governments = {
 			feudal_government
-			muslim_government
 			republic_government
 			merchant_republic_government
 		}

MOD/Witcher/decisions/HL_clan_decisions.txt

@@ -49,6 +49,30 @@ targetted_decisions = {
 					duration = 3650
 					hidden = yes
 				}
+				any_vassal = {
+					limit = {
+						ai = yes
+						is_close_relative = FROM
+						dynasty = FROM
+						OR = {
+							is_adult = no
+							NOT = { trait = zealous }
+						}
+						NOT = { trait = incapable }
+					}
+					religion = ROOT
+				}
+				any_courtier = {
+					limit = {
+						is_close_relative = FROM
+						OR = {
+							is_adult = no
+							NOT = { trait = zealous }
+						}
+						NOT = { trait = incapable }
+					}
+					religion = ROOT
+				}
 
 				hidden_tooltip = {
 					top_liege = {

MOD/Witcher/decisions/HL_mercenary_decisions.txt

@@ -219,6 +219,7 @@ targetted_decisions = {
 		potential = {
 			mercenary = yes
 			primary_title = {
+				NOT = { has_title_flag = ze_dyn_merc }
 				band_creator = {
 					character = FROM
 				}
@@ -325,8 +326,15 @@ decisions = {
 		potential = {
 			has_dlc = "Horse Lords"
 			primary_title = {
+				NOT = { has_title_flag = ze_dyn_merc }
 				mercenary = yes
 				adventurer = yes
+				band_creator = {
+					OR = {
+						government = nomadic_government
+						has_character_modifier = mercenary_traditions
+					}
+				}
 			}
 		}
 		allow = {
@@ -354,8 +362,10 @@ decisions = {
 
 			modifier = {
 				factor = 0.025
-				band_creator = {
-					is_alive = yes
+				primary_title = {
+					band_creator = {
+						is_alive = yes
+					}
 				}
 			}
 
@@ -406,9 +416,14 @@ decisions = {
 		potential = {
 			has_dlc = "Horse Lords"
 			primary_title = {
+				NOT = { has_title_flag = ze_dyn_merc }
 				mercenary = yes
 				band_creator = {
-					is_alive = yes
+					is_alive = yes	
+					OR = {
+						government = nomadic_government
+						has_character_modifier = mercenary_traditions
+					}
 				}
 			}
 		}
@@ -497,8 +512,10 @@ decisions = {
 
 			modifier = {
 				factor = 0.1
-				band_creator = {
-					is_alive = no
+				primary_title = {
+					band_creator = {
+						is_alive = no
+					}
 				}
 			}
 		}

MOD/Witcher/decisions/HL_title_decisions.txt

@@ -4,6 +4,7 @@ title_decisions = {
 		filter = dynasty_owned
 		from_potential = {
 			has_character_flag = raiding_adventurer
+			is_nomadic = no
 			primary_title = {
 				temporary = yes
 			}
@@ -18,6 +19,7 @@ title_decisions = {
 		potential = {
 			tier = COUNT
 			can_be_given_away = yes
+			location =  { num_of_settlements = 1 }
 			holder_scope = {
 				NOT = { has_character_modifier = raider_buy_land_timer }
 			}
@@ -26,7 +28,7 @@ title_decisions = {
 			save_event_target_as = target_title
 			holder_scope = { save_event_target_as = target_ruler }
 			FROM = {
-				letter_event = { id = HL.120 }
+				character_event = { id = HL.120 }
 			}
 		}
 		ai_will_do = {

MOD/Witcher/decisions/conversion_decisions.txt

@@ -457,4 +457,4 @@ decisions = {
 			factor = 0
 		}
 	}
-}			
+}			

MOD/Witcher/decisions/councillor_decision.txt

@@ -31,7 +31,7 @@ decisions = {
 				has_job_title = job_spiritual
 			}
 			NOT = { trait = slothful }
-			NOT = { had_character_flag = { flag = proposed_to_help_liege_with_titles years = 2 } } 
+			NOT = { had_character_flag = { flag = proposed_to_help_liege_with_titles days = 730 } } 
 		}
 		allow = {
 			liege = {
@@ -57,9 +57,7 @@ decisions = {
   				custom_tooltip = {
   					text = NOT_GETTING_HELP_WITH_TITLES_TOOLTIP
   					hidden_tooltip = {
-  						OR = {
-  							NOT = { has_character_flag = getting_help_with_titles }
-						}
+  						NOT = { has_character_flag = getting_help_with_titles }
   					}
   				}
 			}

MOD/Witcher/decisions/dynasty_decisions.txt

@@ -35,6 +35,10 @@ targetted_decisions = {
 		}
 		effect = {
 			prestige = -200
+			add_character_modifier = {
+				modifier = suicide
+				duration = -1
+			}
 			death = { death_reason = death_suicide }
 		}
 		revoke_allowed = {
@@ -206,6 +210,8 @@ targetted_decisions = {
 				mother = { character = FROM }
 			}
 			OR = {
+				father = { ai = no }
+				mother = { ai = no }
 				is_female = no
 				is_primary_heir = yes
 				AND = {
@@ -833,19 +839,17 @@ targetted_decisions = {
 			}
 			has_job_title = no
 			NOT = { is_ruler = yes }
-			OR = {
-				custom_tooltip = {
-					text = is_target_of_murder_plot_tooltip
-					hidden_tooltip = {
-						OR = {
-							has_character_modifier = suspected_murder_plot
-							FROM = {
-								any_known_plotter = {
-									target = PREV
-									OR = {
-										has_plot = plot_kill_character
-										has_plot = plot_kill_spouse
-									}
+			custom_tooltip = {
+				text = is_target_of_murder_plot_tooltip
+				hidden_tooltip = {
+					OR = {
+						has_character_modifier = suspected_murder_plot
+						FROM = {
+							any_known_plotter = {
+								target = PREV
+								OR = {
+									has_plot = plot_kill_character
+									has_plot = plot_kill_spouse
 								}
 							}
 						}
@@ -1050,15 +1054,15 @@ targetted_decisions = {
 				any_child = {
 					limit = {
 						ROOT = {
-							NOT = { is_plot_target_of = THIS }
+							NOT = { is_plot_target_of = PREV }
 						}
 					}
 					character_event = { id = CM.6003 }
 				}
 				any_lover = {
 					limit = {
-						PREV = {
-							NOT = { is_plot_target_of = THIS }
+						ROOT = {
+							NOT = { is_plot_target_of = PREV }
 						}
 						NOT = { spouse = { character = PREV } }
 					}
@@ -1067,7 +1071,7 @@ targetted_decisions = {
 				any_sibling = {
 					limit = {
 						ROOT = {
-							NOT = { is_plot_target_of = THIS }
+							NOT = { is_plot_target_of = PREV }
 						}
 					}
 					character_event = { id = CM.6003 }
@@ -1076,7 +1080,7 @@ targetted_decisions = {
 					limit = {
 						spouse = { NOT = { character = PREV } }
 						ROOT = {
-							NOT = { is_plot_target_of = THIS }
+							NOT = { is_plot_target_of = PREV }
 						}
 					}
 					character_event = { id = CM.6003 }