branch

This reverts commit afca855.

common/on_action/death.txt

@@ -200,6 +200,7 @@ on_death = {
 					scope:killer = { save_scope_as = arthas }
 					trigger_event = { 
 						id = uther_events.001
+						days = 3
 					}
 				}
 				# Terenas Funeral

common/script_values/wc_arthas_expedition_values.txt

@@ -97,6 +97,15 @@ find_uther_value = {
 		limit = { has_trait = temperate }
 		add = 10
 	}
+
+	if = {
+		limit = { exists = character:60036 this = character:60036 }
+		add = 100
+	}
+	if = {
+		limit = { is_landed = yes }
+		add = 20
+	}
 }
 find_jaina_value = {
 	value = 0.001

common/scripted_effects/wc_arthas_expedition_effects.txt

@@ -17,21 +17,23 @@
 		set_global_variable = { name = arthas_character value = this }
 	}
 }
+
 find_uther_effect = {
 	every_courtier = { add_to_temporary_list = valid_uthers }
 	every_vassal = { add_to_temporary_list = valid_uthers }
 	top_liege = {
 		every_courtier = { add_to_temporary_list = valid_uthers }
 		every_vassal = { add_to_temporary_list = valid_uthers }
+		every_vassal = { every_vassal = { add_to_temporary_list = valid_uthers } }
+		every_vassal = { every_vassal = { every_vassal = { add_to_temporary_list = valid_uthers } } }
 	}
 	faith = {
 		every_faith_holy_order = { leader = { add_to_temporary_list = valid_uthers } }
 	}
+	every_player = { add_to_temporary_list = valid_uthers }
 	ordered_in_list = {
-		limit = {
-			is_ai = yes
-
-			can_be_invited_in_arthas_expedition_trigger = { INVITER = scope:host }
+		limit = { # Uther wont be invited with the normal trigger	
+			is_available_for_activity_trigger = yes
 		}
 		list = valid_uthers
 		order_by = find_uther_value

events/activities/arthas_expedition_activity/wc_arthas_expedition_events.txt

@@ -56,9 +56,9 @@ wc_arthas_story.10 = {
 	immediate = {
 		if = {
 			limit = { root = scope:host }
-
 			find_uther_effect = yes
 			find_jaina_effect = yes
+
 			scope:uther = {
 				if = {
 					limit = { is_commanding_army = yes }
@@ -124,6 +124,7 @@ wc_arthas_story.10 = {
 		name = wc_arthas_story_10_OPT_arthas
 	}
 }
+
 # Everything around looks dead, you find an abandoned farm, is attacked by undead inside, briefly see Kel'Thuzad
 wc_arthas_story.15 = {
 	type = activity_event
@@ -298,6 +299,7 @@ wc_arthas_story.30 = {
 			NOT = { root = scope:host }
 		}
 	}
+
 	on_trigger_fail = {
 		# Stops the event chain
 		if = {
@@ -398,11 +400,11 @@ wc_arthas_story.30 = {
 		if = {
 			limit = { root = scope:host }
 			share_event_with_group_delay_effect = { ID = wc_arthas_story.35 DAYS = 1 }
-			trigger_event = { id = wc_arthas_story.40 days = @stratholme_delay }
 		}
 	}
 }
-# Arthas tells you about his decision (it depends on Arthas' decision above)
+
+# Arthas tells you about his decision (it depends on Arthas' decision above & Uther's interference)
 wc_arthas_story.35 = {
 	type = activity_event
 	title = {
@@ -480,6 +482,7 @@ wc_arthas_story.35 = {
 
 			purge_event_modifier = yes
 		}
+
 	}
 	# Stay (evacuate)
 	option = {
@@ -521,10 +524,18 @@ wc_arthas_story.35 = {
 			}
 		}
 		trigger = {
-			NAND = {
-				scope:activity = { has_variable = jaina }
-				scope:activity.var:jaina = { is_alive = yes }
-				root = scope:activity.var:jaina
+			NOR = {
+				AND = {
+					scope:activity = { has_variable = uther }
+					root = scope:activity.var:uther
+					scope:activity.var:uther = { is_alive = yes }
+					scope:activity.var:uther = { is_ai = yes }
+				}
+				AND = {
+					scope:activity = { has_variable = jaina }
+					scope:activity.var:jaina = { is_alive = yes }
+					root = scope:activity.var:jaina
+				}
 			}
 		}
 
@@ -540,6 +551,39 @@ wc_arthas_story.35 = {
 			}
 		}
 	}
+	# Uther's Reaction, might leave
+	option = {
+		name = wc_arthas_story_35_OPT_B_purge_uther
+
+		trigger = {
+			trigger = { scope:stratholme_action = flag:purge }
+			scope:activity = { has_variable = uther }
+			scope:activity.var:uther = { is_alive = yes }
+			root = scope:activity.var:uther
+			scope:activity.var:uther = { is_ai = no } # no ai
+			scope:activity.var:uther = { is_uther_trigger = yes } #real uther
+		}
+
+
+		scope:activity.var:uther = {
+			add_character_flag = uther_decision
+			trigger_event = {
+				id = uther_events.002
+			}
+		}
+
+		custom_tooltip = uther_tooltip
+
+		ai_chance = {
+			base = 15
+
+			leave_event_modifier = yes
+			modifier = {
+				scope:activity.var:uther ?= root
+				add = 5
+			}
+		}
+	}
 	# Leave - Jaina
 	option = {
 		name = {
@@ -580,6 +624,26 @@ wc_arthas_story.35 = {
 			}
 		}
 	}
+	after = {
+		if = {
+			limit = { scope:activity.var:uther = {
+				has_character_flag = uther_decision
+			} }
+			#wait for uther decision
+			trigger_event = {
+				id = wc_arthas_story.40
+				days = 10
+			}
+			current_travel_plan = {
+				delay_travel_plan = { days = 10 }
+			}
+		}
+		else = {
+			# continue like normal
+			trigger_event = { id = wc_arthas_story.40 days = 3 }
+		}
+	}
+
 }
 # Arthas does what he wanted with the city (it depends on Arthas' decision above)
 wc_arthas_story.40 = {