Merge branch 'dev' into feat/mixed/horde-invasion-flavor

common/activities/activity_types/adult_education.txt

@@ -170,12 +170,18 @@
 		custom_tooltip = {
 			text = activity_pilgrimage.war_dangerous
 			NOR = {
-				county.holder = { any_war_enemy = { is_crisis_trigger = yes } }
-				county.holder = { any_liege_or_above = { any_war_enemy = { is_crisis_trigger = yes } } }
-				county.holder = { is_crisis_trigger = yes }
-				county.holder = { any_liege_or_above = { is_crisis_trigger = yes } }
+				county.holder ?= { any_war_enemy = { is_crisis_trigger = yes } }
+				county.holder ?= { any_liege_or_above = { any_war_enemy = { is_crisis_trigger = yes } } }
+				county.holder ?= { is_crisis_trigger = yes }
+				county.holder ?= { any_liege_or_above = { is_crisis_trigger = yes } }
 			}
 		}
+		trigger_if = {
+			limit = {
+				exists = county.holder
+			}
+			NOT = { county.holder = { is_isolated_from_trigger = { target = scope:host } } }
+		}
 	}
 
 	province_description = {

common/activities/activity_types/feast.txt

@@ -1093,6 +1093,15 @@ activity_feast = {
 						desc = court_event_discount_desc
 					}
 				}
+				if = {
+					limit = {
+						has_character_modifier = wc_suramar_supporting_arcwinists_modifier
+					}
+					multiply = {
+						value = 0.75
+						desc = MODIFIER_DESC_wc_suramar_supporting_arcwinists_modifier
+					}
+				}
 				if = {
 					limit = {
 						has_character_flag = food_improves_feasts
@@ -4208,6 +4217,10 @@ activity_feast = {
 				}
 				remove_character_flag = feast_ai_override
 			}
+			add_character_flag = { # Warcraft - For ref in events
+				flag = wc_feast_cooldown
+				years = standard_feast_cooldown_time
+			}
 		}
 		set_variable = {
 			name = host_var