Merge branch 'master' into flavor-events-nyxi

common/character_interactions/00_alliance.txt

@@ -46,6 +46,34 @@
 		}
 
 		scope:actor = {
+			trigger_if = {
+				limit = {
+					is_in_same_union_trigger = { TARGET = scope:recipient }
+					any_in_global_list = {
+						variable = all_unions
+						var:this_union = scope:actor.var:this_union
+						save_temporary_scope_as = my_union
+					}
+					scope:my_union.var:centralization_value > -75
+					scope:target = { primary_attacker = prev }
+				}
+				trigger_if = {
+					limit = {
+						scope:my_union.var:centralization_value >= 75
+						NOT = { scope:my_union.story_owner = scope:actor }
+					}
+					custom_tooltip = {
+						text = can_call_leader_in_offensive
+						scope:my_union.story_owner = scope:recipient
+					}
+				}
+				trigger_else = {
+					custom_tooltip = {
+						text = union_leader_trigger_attacker_war
+						leads_any_this_union_trigger = yes
+					}
+				}
+			}
 			trigger_if = {
 				limit = {
 					scope:target = {

common/character_interactions/wc_debug_interactions.txt

@@ -58,12 +58,12 @@ break_union_interaction = {
 
 	is_shown = {
 		debug_only = yes
-		scope:recipient = { is_in_any_pol_faction_trigger = yes }
+		scope:recipient = { is_in_any_this_union_trigger = yes }
 	}
 
 	on_accept = {
 		scope:recipient = {
-			break_any_union_effect = yes
+			break_union_effect = yes
 		}
 	}
 	auto_accept = yes

common/character_interactions/wc_pol_faction_interactions.txt

@@ -1,30 +1,30 @@
-invite_to_pol_faction_interaction = {
+invite_to_this_union_interaction = {
 	category = interaction_category_diplomacy
 	ai_min_reply_days = 4
 	ai_max_reply_days = 9
 
-	send_name = invite_to_pol_faction_interaction
+	send_name = invite_to_this_union_interaction
 
 	interface_priority = 60
-	desc = invite_to_pol_faction_interaction_desc
+	desc = invite_to_this_union_interaction_desc
 	icon = alliance
 
 	greeting = positive
-	notification_text = invite_to_pol_faction_interaction_notification
+	notification_text = invite_to_this_union_interaction_notification
 
 	is_shown = {
-		scope:recipient = {
-			NOT = { this = scope:actor }
+		scope:actor = {
 			is_ruler = yes
-
-			can_be_in_faction_of_trigger = { target = scope:actor }
 
-			is_in_any_pol_faction_trigger = no
+			leads_any_this_union_trigger = yes
 		}
-		scope:actor = {
+		scope:recipient = {
+			NOT = { this = scope:actor }
 			is_ruler = yes
+
+			can_be_in_union_of_trigger = { target = scope:actor }
 
-			leads_any_pol_faction_trigger = yes
+			is_in_any_this_union_trigger = no
 		}
 	}
 
@@ -33,13 +33,13 @@
 			is_landed = yes
 			is_imprisoned = no
 
-			has_pol_faction_cooldown_trigger = no
+			has_this_union_cooldown_trigger = no
 		}
 		scope:actor = {
 			is_landed = yes
 			is_imprisoned = no
 
-			is_at_war = no
+			#is_at_war = no
 		}
 		scope:recipient = {
 			is_busy_in_events_localised = yes
@@ -83,7 +83,7 @@
 	send_options_exclusive = no
 
 	on_accept = {
-		invite_to_pol_faction_effect = yes
+		invite_to_this_union_effect = yes
 	}
 
 	on_decline = {
@@ -109,7 +109,7 @@
 	ai_accept = {
 		base = -20
 		negotiate_alliance_modifiers = yes
-		invite_to_pol_faction_modifiers = yes
+		invite_to_this_union_modifiers = yes
 	}
 
 	ai_potential = {

common/coat_of_arms/template_lists/colored_emblem_lists.txt

@@ -647,6 +647,11 @@ colored_emblem_texture_lists = {
 			100     = "ce_alteran_eagle.dds"
 			100     = "ce_kul_tiras.dds"
 			100     = "ce_kirintor_eye.dds"
+			100 	= "ce_human_axe.dds"
+			100	= "ce_human_lion2.dds"
+			100	= "ce_human_book.dds"
+			100	= "ce_human_sun.dds"
+			100	= "ce_human_regal.dds"
 		}
 		special_selection = {
 			trigger = { scope:culture = { has_coa_gfx = tirassian_coa_gfx } }	

common/culture/name_lists/wc_gorian.txt

@@ -31,7 +31,7 @@
 		Grosh Gurn Ko'ragh Kolbin Kor'gall Kor'gresh Korgaah Kovork Kreeg Krol Kromcrush Krosh Lantresor Lo Lump 
 		Magronos Mal'druk Mizzle Mogor Mojo Mol'dar Molok Muckrake Mug'thol Mugdorg Ollaramm Ollazgorm Orloch 
 		Oroam Orodaruld Orogurdan Oroma Orrus Rhahk'Zor Ronagarstan Ronamar Rongorm Ronllak Sadaragg Sargam Ogron Omgorn Ommok 
-		Roggam Slip'kik Targ Tectus Tharg Tho'grun Thugrim Trogm Turok Unkor Vul Zilb Zorbo Zzarc
+		Roggam Slip'kik Targ Tectus Tharg Thog Tho'grun Thugrim Trogm Turok Unkor Vul Zilb Zorbo Zzarc
 	}
 	female_names = {
 		Vaxar Ogg'ora Mai Zoth Mizzle Draza Trogma Kovork Gro'ach Grog'ak Grosh Gurn Ko'ragh Kolbine Kor'gall 

common/culture/name_lists/wc_hyenaic.txt

@@ -407,7 +407,7 @@
         Chaucer Chutzpa Clover Crusher Daredevil Dazzler Dirtpaw Eater Evert Ewok Falcon Fangore Fedfennel Fenruner Fighter 
         Flopper Furr Gimp Gnarlhide Gnawbone Grime Groll Grrrr Gruff Grumpy Grums Hogger Hunter Invader Jackal Knickerbocker Knockout 
         Kudu Lashlash Lobos Lunatic Madbeast Maduro Maggot Maicoh Marauder Metis Miblon Misery Mongrel Moonruner Morder Mosshide Mutt 
-        Myth Orsoly Osborn Otso Piggy Pippin Primitive Rhino Ribchaser Rider Ro'Bark Robber Rohh Scorchheart Scythetooth Sergeant 
+        Myth Orsoly Osborn Otso Piggy Pippin Primitive Rhino Ribchaser Rider Ro'Bark Robber Rohh Sagepaw Scorchheart Scythetooth Sergeant 
         Shorty Shredder Snagglespear Snarlmane Snarltooth Spyestr Strongstride Suppressors Swiftbite Tag Thorburn Thug Thunder 
         Toothy Terrifying Urs Vengen Vuk Yowler Zeeb Grik Drerk Marrg Rarg Gyrrg Urgizz Arguc Grarrg Rric Meirg Kreirk Throbal Mohna
 		Sryzaa Gnyrgu Dunko Trehneil Daigrron Krixem Dazlom Mogvo Grozzyrr Gror Gul Baal Thriat Thum Sagrom Rogrim

common/culture/name_lists/wc_murine.txt

@@ -9,12 +9,13 @@
 	}
 
 	male_names = {
-		Feeboz Sleeby Bezid Biang Biddik Box Bragdiag Brikkurg Bruzind Chink Choh Chredrak Chreekkind Chreldrerc Chrerung Chrigmaang Chring Chrukkarg Chrurkunk Chudod Chunderk Clis Closz 
-        Clud Clumkond Clunszid Clus Cres Crezi Crink Crirg Crirgrig Crog Crutruc Degveeg Deitzer Derzing Digger Disz Drac Dras Draugdric Drezid Dric Drorreeng Druzung Duk 
-        Dukdrorg Dux Ekgred Eldrain Emgrek Flintdagger Gaih Gamgurk Gemcud Gengiarc Gerdris Ghresz Ghric 
-        Ghrikhreel Ghrirg Ghruddec Ghruddirc Gibblesnik Giddek Goldtooth 
-        Gomzrung Greenk Griderc Grizlak Ikisk Ikzink Kaac Kadrunk Kaik Kangisk Karid Khal Khem Khiggaurc Khin Khisz Khizzeng Khurdees Kic Knatvig Kneezzong Kondec Krabbirc 
-        Kred Krozarc Narg Ogvah Qen Qharoc Qherk Qhir Qhukzeisk Qrigbraun Qrirc Qrizon Qroc Qrubbox Ruklar 
+		Feeboz Sleeby Bezid Biang Biddik Box Bragdiag Brikkurg Bruzind
+		Chink Choh Chredrak Chreekkind Chreldrerc Chrerung Chrigmaang Chring Chrukkarg Chrurkunk Chudod Chunderk Clis Closz Clud Clumkond Clunszid Clus Cres Crezi Crink Crirg Crirgrig Crog Crutruc
+		Degveeg Deitzer Derzing Digger Disz Drac Dras Draugdric Drezid Dric Drorreeng Druzung Duk Dukdrorg Dux
+		Ekgred Eldrain Emgrek Flintdagger Gaih Gamgurk Gemcud Gengiarc Gerdris Ghresz Ghric 
+        Ghrikhreel Ghrirg Ghruddec Ghruddirc Gibblesnik Giddek Goldtooth Gomzrung Greenk Griderc Grizlak
+		Ikisk Ikzink Kaac Kadrunk Kaik Kangisk Karid Khal Khem Khiggaurc Khin Khisz Khizzeng Khurdees Kic Knatvig Kneezzong Kondec Krabbirc Kred Krozarc Kubb
+		Narg Nazrim Ogvah Qen Qharoc Qherk Qhir Qhukzeisk Qrigbraun Qrirc Qrizon Qroc Qrubbox Ruklar 
         Shrak Shrudind Shrund Shubid Shuk Skarc Skidded Snemcho Snivvle 
         Snizrin Snizzeing Strigbruk Szokgrees Szongac Szuk Thruddia Triask Trirdrod Trorraank Trud Trurink Uggix Unging Utzesz Vaakvaak Ved Viah Vrag Vrakkak Vred Vrir 
         Vrireex Vrisk Vrond Vrurg Xaank Xidgarc Xirk Xogdresk Xorg Xukkaurk Zeg Zerkrik Ziamgal Zikorg Zimchi Znort Zozzank Zrec 
@@ -24,7 +25,7 @@
 		Aithring Bahs Bekzih Bez Bharihs Bharkhan Bhragoz Bhrarla Bhrekseng Bhrikka Bhrudan Bina Buy Chaizde Chel Cherro Chikneih 
         Chong Chreetti Chunshe Clazzu Cluggvihs Crin Cyahl Cyez Cyurral Dhas Dhurszi Dildjeh Ding Dus Eddoh Emcheihl Gahs Gaing 
         Gas Gerdjehs Gheal Gilbla Iggo Itteng Itzais Kadjo Khey Khin Khremchez Khribea Kilgee Klihs Knaray Knarde Knithung Kodei 
-        Oriax Scagen Scemgeang Sciy Shaahn Sheh Shibuhs Shnatti Shneakka Shnealgil Shnirru Shnis Shnoy Shraan Shres Shrey Shrige 
+        Oriax Nazrin Scagen Scemgeang Sciy Shaahn Sheh Shibuhs Shnatti Shneakka Shnealgil Shnirru Shnis Shnoy Shraan Shres Shrey Shrige 
         Shtikke Shtudju Slaagga Snahs Snamgluhl Snes Snirdje Snoddey Snux Strandaa Strarru Strihn Strikgi Szaakge Szeahl Szeir Szez 
         Szin Sziy Szuzzo Tarsza Tattu Thebbi Theing Therla Thiy Threalkha Threinshi Threlgaang Thrergex Throz Vebbu Vez Vrardjen 
         Vreay Vrehn Vrekzis Vrigreim Vrul Zaaken Zeida Zeirgeen Zimchaas Zrul Zrumsrol

common/culture/name_lists/wc_uldumanic.txt

@@ -170,13 +170,13 @@ name_list_drogbar = {
 	}
 
 	male_names = {
-		Amgrol Amprol Arbrogg Armazkul Armol Blelgol Blevofrun Blorgarbugg Bubgrol Clalmugg Clolufrogg Clomgrub Dlalurbul Dlizgrugg Ezarol Ezgrul Gelprogg Halgogg Hudrugg 
-		Inbrugg Jankrogg Jiruzkol Kagamprub Kerbul Koggrugg Komprolg Lemprogg Lilbrugg Lozgrugg Lumgrob Mamgrugg Mamrul Mardul Nozgozkugg Torurgrugg Ukrun Ulabgrob Urmogg 
+		Amgrol Amprol Arbrogg Armazkul Armol Blelgol Blevofrun Blorgarbugg Brawler Bubgrol Clalmugg Clolufrogg Clomgrub Dlalurbul Dlizgrugg Ezarol Ezgrul Galgosh Gelprogg Gnasher Grawmug Halgogg Hudrugg 
+		Inbrugg Jankrogg Jiruzkol Kagamprub Kerbul Koggrugg Komprolg Lemprogg Lilbrugg Lozgrugg Lumgrob Magosh Mamgrugg Mamrul Mardul Nozgozkugg Torurgrugg Ukrun Ulabgrob Urmogg 
 		Urogg Zirgogg
 	}
 	female_names = {
-		Amgrol Amprol Arbrogg Armazkul Armol Blelgol Blevofrun Blorgarbugg Bubgrol Clalmugg Clolufrogg Clomgrub Dlalurbul Dlizgrugg Ezarol Ezgrul Gelprogg Halgogg Hudrugg 
-		Inbrugg Jankrogg Jiruzkol Kagamprub Kerbul Koggrugg Komprolg Lemprogg Lilbrugg Lozgrugg Lumgrob Mamgrugg Mamrul Mardul Nozgozkugg Torurgrugg Ukrun Ulabgrob Urmogg 
+		Amgrol Amprol Arbrogg Armazkul Armol Blelgol Blevofrun Blorgarbugg Brawler Bubgrol Clalmugg Clolufrogg Clomgrub Dlalurbul Dlizgrugg Ezarol Ezgrul Galgosh Gelprogg Gnasher Grawmug Halgogg Hudrugg 
+		Inbrugg Jankrogg Jiruzkol Kagamprub Kerbul Koggrugg Komprolg Lemprogg Lilbrugg Lozgrugg Lumgrob Magosh Mamgrugg Mamrul Mardul Nozgozkugg Torurgrugg Ukrun Ulabgrob Urmogg 
 		Urogg Zirgogg
 	}
 	dynasty_of_location_prefix = ""

common/customizable_localization/00_FR_custom_loc.txt

@@ -7474,27 +7474,27 @@ FR_LLa_Union = {
 
 	text = {
 		trigger = {
-			exists = var:gui_pol_faction_name
+			exists = var:gui_this_union_name
 
-			var:gui_pol_faction_name = flag:alliance
+			var:gui_this_union_name = flag:alliance
 		}
 		localization_key = CustomLoc_FR_l
 	}
 
 	text = {
 		trigger = {
-			exists = var:gui_pol_faction_name
+			exists = var:gui_this_union_name
 
-			var:gui_pol_faction_name = flag:horde
+			var:gui_this_union_name = flag:horde
 		}
 		localization_key = CustomLoc_FR_la
 	}
 
 	text = {
 		trigger = {
-			exists = var:gui_pol_faction_name
+			exists = var:gui_this_union_name
 
-			var:gui_pol_faction_name = flag:custom
+			var:gui_this_union_name = flag:custom
 		}
 		localization_key = "CV_FR_CUSTOM_UNDEFINED_UNION"
 	}