hunting diff

--- Crusader Kings II.pre-roi/events/hunting_events.txt	2014-03-02 15:02:47.680315709 +0000
+++ Crusader Kings II/events/hunting_events.txt	2014-03-25 19:40:50.343259781 +0000
@@ -13,39 +13,34 @@
 #A Majestic Stag
 character_event = {
 	id = 36000
-	desc = EVTDESC36000
-	picture = GFX_evt_hunt
-
+	desc = "EVTDESC36000"
+	picture = "GFX_evt_hunt"
+
 	min_age =  16
 	only_men = yes
 	capable_only = yes
 	prisoner = no

 	trigger = {
-		has_character_flag = holding_grand_hunt
-		NOT = { has_character_modifier = a_mighty_trophy }
+		has_character_modifier = holding_grand_hunt
 		NOT = {	health_traits = 1 }
 	}

 	mean_time_to_happen = {
-		days = 100
-
+		days = 200
+
 		modifier = {
 			factor = 1.5
 			trait = content
 		}
 		modifier = {
-			factor = 0.4
-			has_character_modifier = master_hunter
-		}
-		modifier = {
 			factor = 0.8
 			trait = hunter
 		}
 		modifier = {
 			factor = 5.0
 			martial = 15
-		}
+		}
 		modifier = {
 			factor = 2.0
 			trait = slothful
@@ -58,11 +53,11 @@
 			factor = 1.25
 			trait = craven
 		}
-
+
 	}

 	option = {
-		name = EVTOPTA36000
+		name = "EVTOPTA36000"
 		trigger = {
 			NOT = {
 				trait = craven
@@ -70,43 +65,37 @@
 		}
 		prestige = 5
 	}
-
+
 	option = {
-		name = EVTOPTB36000
-		tooltip_info = craven
+		name = "EVTOPTB36000"
 		trigger = {
 			trait = craven
 		}
-		add_character_modifier = {
-			name = fear_of_the_stag
-			duration = 365
-		}
+		prestige = -10
 	}
 	option = {
-		name = EVTOPTC36000
+		name = "EVTOPTC36000"
 		trigger = {
 			NOT = { trait = greedy }
 			NOT = { trait = arbitrary }
 			NOT = { trait = envious }
 			NOT = { trait = craven }
+			NOT = { trait = cruel }
 		}
-		add_character_modifier = {
-			name = noble_heart
-			duration = 365
-		}
+		add_trait = kind
 	}
-
+
 	option = {
-		name = EVTOPTD36000
+		name = "EVTOPTD36000"
 		trigger = {
 			NOT = { trait = craven }
 			NOT = { trait = humble }
 			NOT = { trait = content }
-		}
+		}
 		random_list = {
-			75 = {}
-			10 = { change_martial = 1 }
-			10 = {
+			60 = { }
+			20 = { change_martial = 1 }
+			14 = {
 				add_trait = wounded
 				hidden_tooltip = { character_event = { id = 38280 } }
 			}
@@ -115,52 +104,46 @@
 				hidden_tooltip = { character_event = { id = 38281 } }
 			}
 			1 = {
-				death = {
-					death_reason = death_accident
-				}
+				death = { death_reason = death_accident }
 			}
 		}
 		set_character_flag = hunt_killed_something
-		add_character_modifier = {
-			name = a_mighty_trophy
-			duration = 365
-		}
-	}
+		prestige = 20
+	}
 }

-#Paranoia in the hunt
+#Paranoia in the hunt
 character_event = {
 	id = 36001
-	desc = EVTDESC36001
-	picture = GFX_evt_hunt
-
+	desc = "EVTDESC36001"
+	picture = "GFX_evt_hunt"
+
 	prisoner = no
 	capable_only = yes

 	trigger = {
-		has_character_flag = holding_grand_hunt
+		has_character_modifier = holding_grand_hunt
 		NOT = { has_character_flag = hunt_paranoia }
 		trait = paranoid
 		NOT = {	health_traits = 1 }
 		any_courtier = {
-			prisoner = no
 			has_plot = plot_kill_character
 			plot_target_char = {
-				character = ROOT
+				character = root
 			}
 		}
 	}

 	mean_time_to_happen = {
-		days = 50
+		days = 200
 	}
-
+
 	immediate = {
 		set_character_flag = hunt_paranoia
-	}
+	}

 	option = {
-		name = EVTOPTA36001
+		name = "EVTOPTA36001"
 		random_list = {
 			75 = {}
 			20 = {
@@ -178,15 +161,12 @@
 				}
 			}
 			1 = {
-				death = {
-					death_reason = death_accident
-				}
+				death = { death_reason = death_accident }
 				any_courtier = {
 					limit = {
-						prisoner = no
 						has_plot = plot_kill_character
 						plot_target_char = {
-							character = ROOT
+							character = root
 						}
 					}
 					character_event = {
@@ -199,8 +179,7 @@
 	}

 	option = {
-		name = EVTOPTB36001
-		tooltip_info = patient
+		name = "EVTOPTB36001"
 		trigger = {
 			trait = patient
 		}
@@ -209,48 +188,43 @@
 			5 = {
 				any_courtier = {
 					limit = {
-						prisoner = no
-						age = 16
+						is_adult = yes
 						NOT = {
 							has_plot = plot_kill_character
 							plot_target_char = {
-								character = ROOT
+								character = root
 							}
 						}
 					}
 					character_event = {
 						id = 36005
 						days = 1
-						tooltip = EVTTOOLTIP36004
+						tooltip = "EVTTOOLTIP36004"
 					}
 				}
 			}
 			5 = {
 				any_courtier = {
 					limit = {
-						prisoner = no
 						has_plot = plot_kill_character
 						plot_target_char = {
-							character = ROOT
+							character = root
 						}
 					}
 					character_event = {
 						id = 36004
 						days = 1
-						tooltip = EVTTOOLTIP36004
+						tooltip = "EVTTOOLTIP36004"
 					}
 				}
 			}
 			5 = {
-				death = {
-					death_reason = death_accident
-				}
+				death = { death_reason = death_accident }
 				any_courtier = {
 					limit = {
-						prisoner = no
 						has_plot = plot_kill_character
 						plot_target_char = {
-							character = ROOT
+							character = root
 						}
 					}
 					character_event = {
@@ -265,57 +239,53 @@

 character_event = {
 	id = 36002
-	desc = EVTDESC36002
-	picture = GFX_evt_hunt
+	desc = "EVTDESC36002"
+	picture = "GFX_evt_hunt"

 	is_triggered_only = yes

 	option = {
-		name = EVTOPTA36002
+		name = "EVTOPTA36002"
 		prestige = 250
 	}
 }

 character_event = {
 	id = 36003
-	desc = EVTDESC36003
-	picture = GFX_evt_hunt
+	desc = "EVTDESC36003"
+	picture = "GFX_evt_hunt"

 	is_triggered_only = yes

 	option = {
-		name = EVTOPTA36003
+		name = "EVTOPTA36003"
 		prestige = 25
 	}
 }

 character_event = {
 	id = 36004
-	desc = EVTDESC36004
-	picture = GFX_evt_hunt
+	desc = "EVTDESC36004"
+	picture = "GFX_evt_hunt"

 	is_triggered_only = yes

 	option = {
-		name = EVTOPTA36004
-		death = {
-			death_reason = death_accident
-		}
+		name = "EVTOPTA36004"
+		death = { death_reason = death_accident }
 	}
 }

 character_event = {
 	id = 36005
-	desc = EVTDESC36005
-	picture = GFX_evt_hunt
+	desc = "EVTDESC36005"
+	picture = "GFX_evt_hunt"

 	is_triggered_only = yes

 	option = {
-		name = EVTOPTA36005
-		death = {
-			death_reason = death_accident
-		}
+		name = "EVTOPTA36005"
+		death = { death_reason = death_accident }
 	}
 }

@@ -323,22 +293,22 @@
 #Deer Hunter, The White Hart
 character_event = {
 	id = 36010
-	desc = EVTDESC36010
-	picture = GFX_evt_hunt
+	desc = "EVTDESC36010"
+	picture = "GFX_evt_hunt"

 	only_playable = yes
 	prisoner = no
 	capable_only = yes
-
+
 	trigger = {
-		has_character_flag = holding_grand_hunt
+		has_character_modifier = holding_grand_hunt
 		NOT = {	health_traits = 1 }
-	}
+	}
+

-
 	mean_time_to_happen = {
 		days = 100
-
+
 		modifier = {
 			factor = 0.75
 			trait = brave
@@ -363,53 +333,54 @@
 			factor = 0.75
 			trait = hunter
 		}
-
+
 		modifier = {
 			factor = 0.5
 			has_character_flag = hunt_good_hounds
 		}
 	}
-
+
 	option = {
-		name = EVTOPTA36010
+		name = "EVTOPTA36010"
 		trigger = {
 			NOT = { trait = greedy }
 			NOT = { trait = cruel }
 		}
 		random_courtier = {
 			limit = {
-				is_female = no
-				NOT = {
-					trait = incapable
-				}
 				trait = brave
 				war = no
 				prisoner = no
-				age = 16
+				is_adult = yes
 				in_command = no
 				is_abroad = no
 			}
 			opinion = {
 				modifier = opinion_disappointed
 				who = ROOT
-				years = 1
+				years = 10
 			}
 		}
 		piety = 25
 	}
-
+
 	option = {
-		name = EVTOPTB36010
+		name = "EVTOPTB36010"
+		trigger = {
+			any_courtier = {
+				is_female = no
+				OR = {
+					martial = 10
+					trait = hunter
+					has_job_title = job_marshal
+				}
+			}
+		}
 		random_courtier = {
 			limit = {
 				is_female = no
-				prisoner = no
-				age = 16
-				NOT = {
-					trait = incapable
-				}
 				OR = {
-					martial = 8
+					martial = 10
 					trait = hunter
 					has_job_title = job_marshal
 				}
@@ -417,20 +388,20 @@
 			opinion = {
 				modifier = opinion_delighted
 				who = ROOT
-				years = 1
+				years = 10
 			}
 			prestige = 20
 		}
 	}
-
+
 	option = {
-		name = EVTOPTC36010
+		name = "EVTOPTC36010"
 		trigger = {
 			NOT = {	trait = craven }
 		}
-		prestige = 15
 		random_list = {
-			85 = {}
+			75 = {}
+			10 = { change_martial = 1 }
 			10 = {
 				add_trait = wounded
 				hidden_tooltip = { character_event = { id = 38280 } }
@@ -439,12 +410,9 @@
 				add_trait = maimed
 				hidden_tooltip = { character_event = { id = 38281 } }
 			}
-		}
-		add_character_modifier = {
-			name = mod_bloodlust
-			duration = 365
 		}
-		set_character_flag = hunt_killed_something
+		prestige = 10
+		set_character_flag = hunt_killed_something
 	}
 }

@@ -452,25 +420,22 @@
 #Boars
 character_event = {
 	id = 36015
-	desc = EVTDESC36015
-	picture = GFX_evt_hunt
-
+	desc = "EVTDESC36015"
+	picture = "GFX_evt_hunt"
+
 	only_playable = yes
 	prisoner = no
 	capable_only = yes

 	trigger = {
-		has_character_flag = holding_grand_hunt
+		has_character_modifier = holding_grand_hunt
 		NOT = {	health_traits = 1 }
-		NOT = {
-			has_character_modifier = master_hunter
-		}
-	}
+	}
+

-
 	mean_time_to_happen = {
 		days = 100
-
+
 		modifier = {
 			factor = 0.75
 			trait = brave
@@ -495,22 +460,22 @@
 			factor = 1.25
 			trait = slothful
 		}
-
-
+
+
 		modifier = {
 			factor = 0.5
 			has_character_flag = hunt_good_hounds
 		}
-
+
 	}

-
+
 	option = {
-		name = EVTOPTA36015
+		name = "EVTOPTA36015"
 		ai_chance = {
 			factor = 1
 			modifier = {
-				factor = 0
+				factor = 0
 				OR = {
 					trait = brave
 					trait = ambitious
@@ -522,41 +487,35 @@
 				martial = 9
 			}
 		}
-
+
 		prestige = 5
 		random_list = {
 			70 = {}
 			30 = { add_trait = craven hidden_tooltip = { character_event = { id = 38257 } } }
-
 		}
 	}
-
+
 	option = {
-		name = EVTOPTB36015
-		if = {
-			limit = { NOT = { trait = craven } }
-			random = {
-				chance = 5
-				add_trait = wounded
-				hidden_tooltip = { character_event = { id = 38280 } }
-			}
+		name = "EVTOPTB36015"
+		trigger = {
+			NOT = { trait = craven }
 		}
-		if = {
-			limit = { trait = craven }
-			change_martial = 1
-			remove_trait = craven
-			random = {
-				chance = 50
+		random_list = {
+			75 = {}
+			10 = { change_martial = 1 }
+			10 = {
 				add_trait = wounded
 				hidden_tooltip = { character_event = { id = 38280 } }
 			}
+			5 = {
+				add_trait = maimed
+				hidden_tooltip = { character_event = { id = 38281 } }
+			}
 		}
-		set_character_flag = hunt_killed_something
-		add_character_modifier = {
-			name = master_hunter
-			duration = 730
-		}
-
+
+		prestige = 10
+		set_character_flag = hunt_killed_something
+
 	}
 }

@@ -564,23 +523,23 @@
 #Bear
 character_event = {
 	id = 36020
-	desc = EVTDESC36020
-	picture = GFX_evt_hunt
-
+	desc = "EVTDESC36020"
+	picture = "GFX_evt_hunt"
+
 	only_playable = yes
 	prisoner = no
 	capable_only = yes

-
+
 	trigger = {
-		has_character_flag = holding_grand_hunt
+		has_character_modifier = holding_grand_hunt
 		NOT = {	health_traits = 1 }
-	}
+	}
+

-
 	mean_time_to_happen = {
 		days = 100
-
+
 		modifier = {
 			factor = 0.75
 			trait = brave
@@ -608,22 +567,23 @@
 		modifier = {
 			factor = 5.0
 			martial = 15
-		}
-
+		}
+
 	}
-
+
 	option = {
-		name = EVTOPTA36020
-		add_trait = wroth
+		name = "EVTOPTA36020"
+		trigger = {
+			NOT = {	trait = craven }
+		}
 		prestige = 5
 	}
-
+
 	option = {
-		name = EVTOPTB36020
+		name = "EVTOPTB36020"
 		trigger = {
 			NOT = {	trait = craven }
 		}
-		prestige = 15
 		random_list = {
 			75 = {}
 			10 = { change_martial = 1 }
@@ -636,28 +596,18 @@
 				hidden_tooltip = { character_event = { id = 38281 } }
 			}
 		}
-		set_character_flag = hunt_killed_something
-		add_character_modifier = {
-			name = mod_bloodlust
-			duration = 365
-		}
-
+		set_character_flag = hunt_killed_something
+		prestige = 10
+
 	}
-
+
 	option = {
-		name = EVTOPTC36020
-		tooltip_info = craven
+		name = "EVTOPTC36020"
 		trigger = {
 			trait = craven
-			any_courtier = {
-				prisoner = no
-				is_abroad = no
-				martial = 10
-			}
 		}
 		any_courtier = {
 			limit = {
-				prisoner = no
 				is_abroad = no
 				martial = 10
 			}
@@ -674,21 +624,23 @@
 #Hound
 character_event = {
 	id = 36025
-	desc = EVTDESC36025
-	picture = GFX_evt_hunt
-
+	desc = "EVTDESC36025"
+	picture = "GFX_evt_hunt"
+
 	only_playable = yes
 	prisoner = no
 	capable_only = yes
-
+
 	trigger = {
-		has_character_flag = holding_grand_hunt
+		has_character_modifier = holding_grand_hunt
 		NOT = { has_character_flag = hunt_good_hounds }
-	}
+		NOT = { trait = craven }
+		NOT = { trait = content }
+	}

 	mean_time_to_happen = {
-		days = 100
-
+		days = 200
+
 		modifier = {
 			factor = 0.75
 			trait = brave
@@ -710,86 +662,47 @@
 			trait = slothful
 		}
 	}
-
+
 	option = {
-		name = EVTOPTA36025
+		name = "EVTOPTA36025"
 		set_character_flag = hunt_good_hounds
-		add_trait = diligent
+		prestige = 5
 		random = {
-			chance = 5
+			chance = 15
 			add_trait = wounded
 		}
 	}
-
-	option = {
-		name = EVTOPTB36025
-		trigger = {
-			NOT = {
-				trait = craven
-			}
-		}
-		ai_chance = {
-			factor = 0
-		}
-		add_trait = craven
-	}
-
+
 	option = {
-		name = EVTOPTC36025
+		name = "EVTOPTC36025"
 		set_character_flag = hunt_good_hounds
+		prestige = 5
 		random = {
 			chance = 25
-			character_event = { id = 36026 days = 1 random = 2 tooltip = EVTTOOLTIP36026 }
-		}
-		add_character_modifier = {
-			name = the_ruthless
-			duration = 180
+			character_event = { id = 36026 days = 1 random = 2 tooltip = "EVTTOOLTIP36026" }
 		}
 	}
-
+
 	option = {
-		name = EVTOPTD36025
-		trigger = {
-			NOT = {
-				trait = content
-			}
-		}
-		add_trait = content
-		random_vassal = {
-			limit = {
-				war = no
-				prisoner = no
-				age = 16
-				NOT = { trait = on_pilgrimage }
-				NOT = {	trait = content }
-				OR = {
-					trait = ambitious
-					trait = brave
-				}
-			}
-			opinion = {
-				modifier = content_neg
-				who = ROOT
-				years = 10
-			}
-		}
+		name = "EVTOPTD36025"
+		prestige = -5
 	}
 }

 character_event = {
 	id = 36026
-	desc = EVTDESC36026
-	picture = GFX_evt_hunt
-
+	desc = "EVTDESC36026"
+	picture = "GFX_evt_hunt"
+
 	is_triggered_only = yes

 	option = {
-		name = EVTOPTA36026
-		scaled_wealth = -0.2
+		name = "EVTOPTA36026"
+		treasury = -15
 		prestige = -10
 	}
 	option = {
-		name = EVTOPTB36026
+		name = "EVTOPTB36026"
 		piety = -50
 		add_trait = cruel
 	}
@@ -800,23 +713,20 @@
 #Horse
 character_event = {
 	id = 36030
-	desc = EVTDESC36030
-	picture = GFX_evt_hunt
-
+	desc = "EVTDESC36030"
+	picture = "GFX_evt_hunt"
+
 	only_playable = yes
 	prisoner = no
 	capable_only = yes
-
+
 	trigger = {
-		has_character_flag = holding_grand_hunt
-		NOT = {
-			has_character_modifier = the_merciful
-		}
-	}
+		has_character_modifier = holding_grand_hunt
+	}

 	mean_time_to_happen = {
 		days = 100
-
+
 		modifier = {
 			factor = 0.75
 			trait = brave
@@ -833,57 +743,43 @@
 			factor = 2.0
 			has_character_flag = hunt_good_hounds
 		}
-
+
 	}
-
+
 	option = {
-		name = EVTOPTA36030
+		name = "EVTOPTA36030"
 		trigger = {
-			NOT = { trait = craven }
 			NOT = { trait = slothful }
 		}
-		add_character_modifier = {
-			name = the_merciful
-			duration = 180
-		}
+
+		piety = 10
 	}
-
+
 	option = {
-		name = EVTOPTB36030
-		if = {
-			limit = {
-				NOT = { trait = slothful }
-			}
-			add_trait = slothful
-		}
-		if = {
-			limit = {
-				trait = slothful
-			}
-			piety = -10
+		name = "EVTOPTB36030"
+		trigger = {
+			trait = slothful
 		}
+		piety = -10
 	}
 }

 #Hare
 character_event = {
 	id = 36035
-	desc = EVTDESC36035
-	picture = GFX_evt_hunt
-
+	desc = "EVTDESC36035"
+	picture = "GFX_evt_hunt"
+
 	prisoner = no
 	capable_only = yes
-
+
 	trigger = {
-		has_character_flag = holding_grand_hunt
-		NOT = {
-			has_character_modifier = master_hunter
-		}
-	}
+		has_character_modifier = holding_grand_hunt
+	}

 	mean_time_to_happen = {
 		days = 100
-
+
 		modifier = {
 			factor = 0.75
 			trait = brave
@@ -904,14 +800,11 @@
 			factor = 1.25
 			trait = slothful
 		}
-	}
+	}

 	option = {
-		name = EVTOPTA36035
-		add_character_modifier = {
-			name = master_hunter
-			duration = 180
-		}
+		name = "EVTOPTA36035"
+		prestige = 5
 	}
 }

@@ -919,24 +812,24 @@
 #Low martial guy, inability to kill something.
 character_event = {
 	id = 36040
-	desc = EVTDESC36040
-	picture = GFX_evt_hunt
-
+	desc = "EVTDESC36040"
+	picture = "GFX_evt_hunt"
+
 	only_playable = yes
 	prisoner = no
 	capable_only = yes
-
+
 	trigger = {
-		has_character_flag = holding_grand_hunt
+		has_character_modifier = holding_grand_hunt
 		NOT = { martial = 8 }
 		NOT = { trait = hunter }
 		NOT = { has_character_flag = hunt_killed_something }

-	}
+	}

 	mean_time_to_happen = {
 		days = 100
-
+
 		modifier = {
 			factor = 0.8
 			trait = craven
@@ -952,40 +845,39 @@
 		modifier = {
 			factor = 0.8
 			trait = poet
-		}
+		}
 		modifier = {
 			factor = 0.8
 			NOT = { martial = 6 }
-		}
+		}
 		modifier = {
 			factor = 0.8
 			NOT = { martial = 4 }
-		}
-	}
+		}
+	}

 	immediate = {
-		set_character_flag = hunt_killed_something
+		set_character_flag = hunt_killed_something

 	}
-
+
 	option = {
-		name = EVTOPTA36040
+		name = "EVTOPTA36040"
 		prestige = -20
 	}
 	option = {
-		name = EVTOPTB36040
+		name = "EVTOPTB36040"
 		random_courtier = {
 			limit = {
-				prisoner = no
-				age = 16
+				is_adult = yes
 				is_female = no
 				martial = 8
 			}
 			opinion = {
 				modifier = opinion_disgruntled
 				who = ROOT
-				years = 2
-			}
+				years = 10
+			}
 		}
 		prestige = -10

@@ -997,25 +889,24 @@
 #High Martial, Overconfidence
 character_event = {
 	id = 36045
-	desc = EVTDESC36045
-	picture = GFX_evt_hunt
-
+	desc = "EVTDESC36045"
+	picture = "GFX_evt_hunt"
+
 	only_playable = yes
 	prisoner = no
 	capable_only = yes
-
+
 	trigger = {
-		has_character_flag = holding_grand_hunt
+		has_character_modifier = holding_grand_hunt
 		martial = 10
 		NOT = {	health_traits = 1 }
 		NOT = { has_character_flag = hunt_killed_something }
-		NOT = {  has_character_modifier = a_mighty_trophy }

-	}
+	}

 	mean_time_to_happen = {
-		days = 100
-
+		days = 400
+
 		modifier = {
 			factor = 0.8
 			trait = brave
@@ -1032,16 +923,16 @@
 			factor = 0.75
 			trait = hunter
 		}
-
-	}
+
+	}

 	immediate = {
-		set_character_flag = hunt_killed_something
+		set_character_flag = hunt_killed_something

 	}
-
+
 	option = {
-		name = EVTOPTA36045
+		name = "EVTOPTA36045"
 		random_list = {
 			60 = {}
 			25 = {
@@ -1053,21 +944,15 @@
 				hidden_tooltip = { character_event = { id = 38281 } }
 			}
 			5 = {
-				death = {
-					death_reason = death_accident
-				}
+				death = { death_reason = death_accident }
 			}
 		}
 		set_character_flag = hunt_killed_something
-		prestige = 10
-		add_character_modifier = {
-			name = a_mighty_trophy
-			duration = 365
-		}
-
+		prestige = 20
+
 	}
 	option = {
-		name = EVTOPTB36045
+		name = "EVTOPTB36045"
 		add_trait = craven
 	}

@@ -1076,34 +961,26 @@
 # courtier/vassal with hunter trait kills something,
 character_event = {
 	id = 36050
-	desc = EVTDESC36050
-	picture = GFX_evt_hunt
-
-	min_age = 16
+	desc = "EVTDESC36050"
+	picture = "GFX_evt_hunt"
+
 	capable_only = yes
 	prisoner = no
-	only_men = yes
-
+
 	trigger = {
-		war = no
+		is_adult = yes
+		trait = hunter
+		liege = { has_character_modifier = holding_grand_hunt }
 		in_command = no
 		independent = no
-		trait = hunter
-		liege = {
-			NOT = {
-				character = ROOT
-			}
-			NOT = {
-				has_character_flag = hunt_killed_something
-			}
-			has_character_flag = holding_grand_hunt
-		}
+		war = no
+		NOT = { liege = { has_character_flag = hunt_killed_something } }
 		NOT = {	health_traits = 1 }
 	}

 	mean_time_to_happen = {
-		days = 50
-
+		days = 200
+
 		modifier = {
 			factor = 0.8
 			trait = brave
@@ -1120,27 +997,30 @@
 			factor = 0.75
 			trait = hunter
 		}
-
-	}
+
+	}

 	option = {
-		name = EVTOPTA36050
+		name = "EVTOPTA36050"
 		ai_chance = {
-			factor = 1
+			factor = 20
 			modifier = {
-				factor = 5
-				trait = ambitious
+				factor = 0
+				trait = content
 			}
 			modifier = {
-				factor = 5
-				trait = proud
+				factor = 0
+				trait = humble
 			}
 		}
 		prestige = 5
-		liege = { character_event = { id = 36051 } }
+		random = {
+			chance = 10
+			liege = { character_event = { id = 36051 } }
+		}
 	}
 	option = {
-		name = EVTOPTB36050
+		name = "EVTOPTB36050"
 		ai_chance = {
 			factor = 20
 			modifier = {
@@ -1151,61 +1031,64 @@
 				factor = 0
 				trait = proud
 			}
-		}
-		add_trait = humble
+		}
 		liege = { character_event = { id = 36052 } }
 	}
 }

-#Boasting hunter
 character_event = {
 	id = 36051
-	desc = EVTDESC36051
-	picture = GFX_evt_hunt
+	desc = "EVTDESC36051"
+	picture = "GFX_evt_hunt"

 	is_triggered_only = yes

 	option = {
-		name = EVTOPTA36051
+		name = "EVTOPTA36051"
 		FROM = {
 			imprison = ROOT
 		}
 		prestige = -5
 	}
 	option = {
-		name = EVTOPTB36051
+		name = "EVTOPTB36051"
 		piety = 5
 	}
 }

 character_event = {
 	id = 36052
-	desc = EVTDESC36052
-	picture = GFX_evt_hunt
+	desc = "EVTDESC36052"
+	picture = "GFX_evt_hunt"

 	is_triggered_only = yes

 	option = {
-		name = EVTOPTA36052
+		name = "EVTOPTA36052"
 		prestige = 5
 		FROM = {
 			opinion = {
 				modifier = opinion_proud
-				who = ROOT
-				years = 2
+				who = root
+				years = 10
 			}
 		}
 	}
 }

-letter_event = {
+character_event = {
 	id = 36080
-	desc = EVTDESC36080
+	picture = "GFX_evt_hunt"
+	desc = "EVTDESC36080"

 	is_triggered_only = yes
-
+
+	immediate = {
+		character_event = { id = 36090 days = 16 random = 25 }
+	}
+
 	option = {
-		name = EVTOPTA36080
+		name = "EVTOPTA36080"
 	}
 }

@@ -1213,20 +1096,19 @@
 #end if we go to war.
 character_event = {
 	id = 36089
-	desc = EVTDESC36089
-	picture = GFX_evt_hunt
-
+	desc = "EVTDESC36089"
+	picture = "GFX_evt_hunt"
 	trigger = {
 		war = yes
-		has_character_flag = holding_grand_hunt
+		has_character_modifier = holding_grand_hunt
 	}

 	mean_time_to_happen = {
 		days = 1
 	}
-
+
 	immediate = {
-		clr_character_flag = holding_grand_hunt
+		remove_character_modifier = holding_grand_hunt
 		clr_character_flag = hunt_paranoia
 		clr_character_flag = hunt_good_hounds
 		clr_character_flag = hunt_killed_something
@@ -1234,67 +1116,63 @@
 	}

 	option = {
-		name = EVTOPTA36089
+		name = "EVTOPTA36089"
 	}
 }

 #Normal end.
 character_event = {
 	id = 36090
-	desc = EVTDESC36090
-	picture = GFX_evt_hunt
+	desc = "EVTDESC36090"
+	picture = "GFX_evt_hunt"

 	is_triggered_only = yes
-
+
 	trigger = {
-		has_character_flag = holding_grand_hunt
-	}
-
+		has_character_modifier = holding_grand_hunt
+	}
+
 	immediate = {
-		clr_character_flag = holding_grand_hunt
+		remove_character_modifier = holding_grand_hunt
+		clr_character_flag = do_not_disturb
 		clr_character_flag = hunt_paranoia
 		clr_character_flag = hunt_good_hounds
 		clr_character_flag = hunt_killed_something
-		clr_character_flag = do_not_disturb
 	}

 	option = {
-		name = EVTOPTA36090
-		prestige = 10
+		name = "EVTOPTA36090"
+		prestige = 5
 	}
 }

 #Deer Park
 character_event = {
 	id = 4075
-	desc = EVTDESC4075
+	desc = "EVTDESC4075"
 	picture = GFX_evt_hunt
-
+
 	min_age = 20
 	only_playable = yes
 	only_men = yes
 	capable_only = yes
 	prisoner = no
-
+
 	trigger = {
 		war = no
 		in_command = no
-		has_character_flag = holding_grand_hunt
-		NOT = { has_character_modifier = a_mighty_trophy }
-		NOT = { has_character_flag = hunt_killed_something	 }
-		NOT = {
-			has_character_modifier = master_hunter
-		}
+		has_character_modifier = holding_grand_hunt
+		NOT = { has_character_flag = hunt_killed_something }
 		job_treasurer = {
 			NOT = {
 				trait = greedy
 			}
-			NOT = {
+			NOT = {
 				trait = deceitful
 			}
 		}
 	}
-
+
 	mean_time_to_happen = {
 		days = 200

@@ -1308,41 +1186,44 @@
 			trait = content
 		}
 	}
-
+
 	option = {
-		name = EVTOPTA4075
-		random_vassal = {
-			limit = {
-				prisoner = no
-				NOT = { trait = on_pilgrimage }
+		name = "EVTOPTA4075"
+		trigger = {
+			NOT = {
+				trait = greedy
+				trait = content
 			}
+		}
+		random_vassal = {
 			opinion = {
 				modifier = opinion_irritated
 				who = ROOT
-				years = 1
+				years = 10
 			}
 		}
 	}
-
+
 	option = {
-		name = EVTOPTB4075
-		add_trait = ambitious
-		random_vassal = {
-			limit = {
-				prisoner = no
-				NOT = { trait = on_pilgrimage }
+		name = "EVTOPTB4075"
+		trigger = {
+			NOT = {
+				trait = greedy
+				trait = content
 			}
+		}
+		treasury = -10
+		random_vassal = {
 			opinion = {
 				modifier = opinion_happy
 				who = ROOT
-				years = 1
+				years = 10
 			}
 		}
 	}
-
+
 	option = {
-		name = EVTOPTC4075
-		#tooltip_info =
+		name = "EVTOPTC4075"
 		trigger = {
 			OR = {
 				trait = greedy
@@ -1353,8 +1234,7 @@
 			limit = {
 				war = no
 				prisoner = no
-				age = 16
-				NOT = { trait = on_pilgrimage }
+				is_adult = yes
 				OR = {
 					trait = diligent
 					trait = ambitious
@@ -1366,20 +1246,26 @@
 			opinion = {
 				modifier = content_neg
 				who = ROOT
-				years = 1
+				years = 10
 			}
-		}
+		}
 	}
+}
+
+###########################################
+# Flag management                         #
+###########################################
+
+# Safety catch - clears character flags and modifiers
+character_event = {
+	id = 36999
+
+	hide_window = yes

-	option = {
-		name = EVTOPTD4075
-		tooltip_info = ambitious
-		trigger = {
-			trait = ambitious
-		}
-		add_character_modifier = {
-			name = master_hunter
-			duration = 180
-		}
+	is_triggered_only = yes
+
+	immediate = {
+		clr_character_flag = do_not_disturb
+		clr_character_flag = holding_grand_hunt
 	}
-}
\ No newline at end of file
+}