Fix: Hunting events now fire during grand hunts

A-hunting we will go. Helps if you actually trigger the event. Various other cleanup included that was done as part of the investigation into the cause.

Author: schwarherz

CK2Plus/events/base_hunting_events.txt

@@ -5,6 +5,8 @@
 # Event ID 36000-36999 is reserved
 #
 # Deer Park ID: 4075
+# WoL.5007
+# HL.1100
 #
 #############################################
 # Written by Johan Andersson, Chris King & Sara Wendel-Örtqvist
@@ -374,12 +376,12 @@ character_event = {
 						}
 
 						is_adult = yes
-						health_traits < 1
 						in_command_trigger = no
 						is_incapable = no
 						prisoner = no
 						war = no
 						is_abroad = no
+						NOT = { health_traits >= 1 }
 
 						trigger_if = {
 							limit = { is_female = yes }
@@ -772,40 +774,29 @@ character_event = {
 		random_list = {
 			75 = { }
 
-			20 = {
+			20 = { # Plotter wounds target
 				add_trait_wounded_effect = yes
 
-				random_courtier = {
+				random_courtier_or_vassal = {
 					limit = {
 						has_plot = plot_kill_character
-
-						plot_target_char = {
-							character = ROOT
-						}
+						plot_target_char = { character = ROOT }
 					}
 
 					character_event = {
 						id = 36003
 						days = 1
 					}
 				}
-
-				character_event = {
-					id = 36003
-					days = 1
-				}
 			}
 
-			4 = {
+			 4 = { # Plotter maims target
 				add_maimed_trait_effect = yes
 
-				random_courtier = {
+				random_courtier_or_vassal = {
 					limit = {
 						has_plot = plot_kill_character
-
-						plot_target_char = {
-							character = ROOT
-						}
+						plot_target_char = { character = ROOT }
 					}
 
 					character_event = {
@@ -815,14 +806,11 @@ character_event = {
 				}
 			}
 
-			1 = {
-				random_courtier = {
+			 1 = { # Plotter kills target
+				random_courtier_or_vassal = {
 					limit = {
 						has_plot = plot_kill_character
-
-						plot_target_char = {
-							character = ROOT
-						}
+						plot_target_char = { character = ROOT }
 					}
 
 					save_event_target_as = killer_target
@@ -833,13 +821,10 @@ character_event = {
 					killer = event_target:killer_target
 				}
 
-				any_courtier = {
+				any_courtier_or_vassal = {
 					limit = {
 						has_plot = plot_kill_character
-
-						plot_target_char = {
-							character = ROOT
-						}
+						plot_target_char = { character = ROOT }
 					}
 
 					character_event = {
@@ -859,11 +844,11 @@ character_event = {
 		random_list = {
 			85 = { }
 
-			5 = {
+			5 = { # Liege kills bystander
 				custom_tooltip = {
 					text = hunt_bystander_dies
 
-					random_courtier = {
+					random_courtier_or_vassal = {
 						limit = {
 							is_adult = yes
 							NOT = { character = ROOT }
@@ -886,17 +871,15 @@ character_event = {
 				}
 			}
 
-			5 = {
+			5 = { # Target kills plotter
 				custom_tooltip = {
 					text = hunt_plotter_dies
 
-					random_courtier = {
+					random_courtier_or_vassal = {
 						limit = {
 							has_plot = plot_kill_character
 
-							plot_target_char = {
-								character = ROOT
-							}
+							plot_target_char = { character = ROOT }
 						}
 
 						character_event = {
@@ -908,15 +891,12 @@ character_event = {
 				}
 			}
 
-			5 = {
+			5 = { # Plotter kills target
 				# TODO: Add better custom_tooltip?
-				random_courtier = {
+				random_courtier_or_vassal = {
 					limit = {
 						has_plot = plot_kill_character
-
-						plot_target_char = {
-							character = ROOT
-						}
+						plot_target_char = { character = ROOT }
 					}
 
 					save_event_target_as = killer_target
@@ -927,13 +907,10 @@ character_event = {
 					killer = event_target:killer_target
 				}
 
-				any_courtier = {
+				any_courtier_or_vassal = {
 					limit = {
 						has_plot = plot_kill_character
-
-						plot_target_char = {
-							character = ROOT
-						}
+						plot_target_char = { character = ROOT }
 					}
 
 					character_event = {
@@ -946,6 +923,7 @@ character_event = {
 	}
 }
 
+# Plotter kills target notification
 character_event = {
 	id = 36002
 	desc = EVTDESC36002
@@ -960,6 +938,7 @@ character_event = {
 	}
 }
 
+# Plotter wounds or maims target notification
 character_event = {
 	id = 36003
 	desc = EVTDESC36003
@@ -974,6 +953,7 @@ character_event = {
 	}
 }
 
+# Target kills plotter
 character_event = {
 	id = 36004
 	desc = EVTDESC36004
@@ -991,6 +971,7 @@ character_event = {
 	}
 }
 
+# Liege kills bystander
 character_event = {
 	id = 36005
 	desc = EVTDESC36005
@@ -1914,9 +1895,12 @@ character_event = {
 			# Try again later
 			repeat_event = {
 				id = 36080
-				days = 30
+				months = 1 # days = 30 if months doesn't work
 			}
 		}
+		else = {
+			clr_character_flag = planning_grand_hunt
+		}
 	}
 
 	immediate = {
@@ -2027,6 +2011,15 @@ character_event = {
 			}
 		}
 	}
+
+	after = {
+		# Queue Tombola
+		character_event = {
+			id = 36085
+			days = 3
+			random = 7
+		}
+	}
 }
 
 character_event = {
@@ -2036,6 +2029,7 @@ character_event = {
 	hide_window = yes
 
 	immediate = {
+		clear_delayed_event = { id = 36085 } # Make sure the hunt tombola stops
 		ROOT = {
 			if = {
 				limit = {
@@ -2104,6 +2098,7 @@ character_event = {
 	}
 
 	immediate = {
+		clear_delayed_event = { id = 36085 } # Make sure the hunt tombola stops
 		remove_do_not_disturb_effect = yes
 		remove_character_modifier = holding_grand_hunt
 		clr_character_flag = hunt_paranoia
@@ -2247,6 +2242,7 @@ character_event = {
 	is_triggered_only = yes
 
 	immediate = {
+		clear_delayed_event = { id = 36085 } # Make sure the hunt tombola stops
 		remove_character_modifier = holding_grand_hunt
 		clr_character_flag = hunt_paranoia
 		clr_character_flag = hunt_good_hounds