common/accolade_names/00_accolade_names.txt

@@ -2910,9 +2910,9 @@ accolade_knight_of_god = {
 					scope:accolade_type = {
 						type_has_accolade_category = defensive
 					}
-#					NOT = {
+					NOT = {
-#						faith.religion = religion:west_african_roog_religion
+						faith.religion = religion:west_african_roog_religion
-#					}
+					}
 				}
 				desc = accolade_health_god
 			}

common/buildings/00_special_buildings.txt

@@ -5288,9 +5288,9 @@ palace_of_ctesiphon_02 = {
 			AND = {
 				OR = {
 					zoroastrian_or_syncretic_with_eastern_trigger = { CHARACTER = scope:holder }
-#					faith = faith:manichean
+					faith = faith:manichean
-#					faith = faith:nestorian
+					faith = faith:nestorian
-#					faith = faith:hellenic_pagan
+					faith = faith:hellenic_pagan
 				}
 				highest_held_title_tier >= tier_kingdom
 				top_liege = this

common/character_interactions/00_scheme_interactions.txt

@@ -2731,25 +2731,25 @@ learn_language_interaction = {
 			}
 		}
 
-#		modifier = { # Nestorian clergy/pious people want to learn aramaic
+		modifier = { # Nestorian clergy/pious people want to learn aramaic
-#			add = 50
+			add = 50
-#			scope:actor = {
+			scope:actor = {
-#				faith = faith:nestorian
+				faith = faith:nestorian
-#				OR = {
+				OR = {
-#					has_trait = zealous
+					has_trait = zealous
-#					has_trait = humble
+					has_trait = humble
-#					is_clergy = yes
+					is_clergy = yes
-#				}
+				}
-#				NOT = {
+				NOT = {
-#					knows_language = language_aramaic
+					knows_language = language_aramaic
-#				}
+				}
-#			}
+			}
-#			scope:recipient = {
+			scope:recipient = {
-#				culture = {
+				culture = {
-#					has_cultural_pillar = language_aramaic
+					has_cultural_pillar = language_aramaic
-#				}
+				}
-##			}
+			}
-##		}
+		}
 
 		modifier = {
 			add = 20

common/customizable_localization/00_artifact_court_custom_loc.txt

@@ -355,7 +355,8 @@ RandomSaint = { # Used for statue artifact
 		trigger = {
 			OR = {
 				religion = religion:catholic_religion
-				religion = religion:eastern_orthodox_religion
+				faith = faith:orthodox
+				faith = faith:nestorian
 			}
 		}
 		localization_key = west_christian_fertility_god_name
@@ -365,7 +366,8 @@ RandomSaint = { # Used for statue artifact
 		trigger = {
 			OR = {
 				religion = religion:catholic_religion
-				religion = religion:eastern_orthodox_religion
+				faith = faith:orthodox
+				faith = faith:nestorian
 			}
 		}
 		localization_key = west_christian_wealth_god_name
@@ -375,7 +377,8 @@ RandomSaint = { # Used for statue artifact
 		trigger = {
 			OR = {
 				religion = religion:catholic_religion
-				religion = religion:eastern_orthodox_religion
+				faith = faith:orthodox
+				faith = faith:nestorian
 			}
 		}
 		localization_key = west_christian_household_god_name
@@ -385,7 +388,8 @@ RandomSaint = { # Used for statue artifact
 		trigger = {
 			OR = {
 				religion = religion:catholic_religion
-				religion = religion:eastern_orthodox_religion
+				faith = faith:orthodox
+				faith = faith:nestorian
 			}
 		}
 		localization_key = west_christian_knowledge_god_name
@@ -395,7 +399,8 @@ RandomSaint = { # Used for statue artifact
 		trigger = {
 			OR = {
 				religion = religion:catholic_religion
-				religion = religion:eastern_orthodox_religion
+				faith = faith:orthodox
+				faith = faith:nestorian
 			}
 		}
 		localization_key = west_christian_war_god_name
@@ -405,7 +410,8 @@ RandomSaint = { # Used for statue artifact
 		trigger = {
 			OR = {
 				religion = religion:catholic_religion
-				religion = religion:eastern_orthodox_religion
+				faith = faith:orthodox
+				faith = faith:nestorian
 			}
 		}
 		localization_key = west_christian_water_god_name

common/customizable_localization/10_ach_custom_loc.txt

@@ -746,9 +746,9 @@ GetCoronationSite = {
 	text = { # Palatine Chapel in Aachen
 		trigger = {
 			OR = {
-						religion = religion:eastern_orthodox_religion
+						faith.religion = religion:eastern_orthodox_religion
-						religion = religion:catholic_religion
+						faith.religion = religion:catholic_religion
-						religion = religion:protestant_religion
+						faith.religion = religion:protestant_religion
 					}
 			has_special_building = yes
 			has_building_or_higher = palace_of_aachen_01
@@ -758,11 +758,7 @@ GetCoronationSite = {
 
 	text = { # Hagia Sophia
 		trigger = {
-			OR = {
+			religion = religion:christianity_religion
-				religion = religion:eastern_orthodox_religion
-				religion = religion:catholic_religion
-				religion = religion:protestant_religion
-			}
 			has_special_building = yes
 			has_building = hagia_sophia_01
 		}
@@ -780,11 +776,7 @@ GetCoronationSite = {
 
 	text = { # Church of the Holy Sepulchre
 		trigger = {
-						OR = {
+			religion = religion:christianity_religion
-				religion = religion:eastern_orthodox_religion
-				religion = religion:catholic_religion
-				religion = religion:protestant_religion
-			}
 			has_special_building = yes
 			OR = {
 				has_building_or_higher = dome_of_the_rock_01
@@ -796,11 +788,7 @@ GetCoronationSite = {
 
 	text = { # Wawel Cathedral
 		trigger = {
-						OR = {
+			religion = religion:christianity_religion
-				religion = religion:eastern_orthodox_religion
-				religion = religion:catholic_religion
-				religion = religion:protestant_religion
-			}
 			this.barony = title:b_krakow
 		}
 		localization_key = CoronationSiteWawelCathedral
@@ -808,11 +796,7 @@ GetCoronationSite = {
 
 	text = { # Westminster Abbey
 		trigger = {
-						OR = {
+			religion = religion:christianity_religion
-				religion = religion:eastern_orthodox_religion
-				religion = religion:catholic_religion
-				religion = religion:protestant_religion
-			}
 			has_special_building = yes
 			has_building_or_higher = the_tower_of_london_01
 		}

common/decisions/00_holy_order_decisions.txt

@@ -1,17 +1,4 @@
-### Found Holy Order ###
 create_holy_order_decision = {
-	picture = {
-		trigger = {
-			culture = { has_graphical_east_asia_culture_group_trigger = yes }
-		}
-		reference = "gfx/interface/illustrations/holding_types/tgp_chinese_pagoda.dds"
-	}
-	picture = {
-		trigger = {
-			culture = { has_graphical_india_culture_group_trigger = yes }
-		}
-		reference = "gfx/interface/illustrations/holding_types/tgp_castle_se_asia.dds"
-	}
 	picture = {
 		reference = "gfx/interface/illustrations/decisions/decision_major_religion.dds"
 	}
@@ -21,10 +8,7 @@ create_holy_order_decision = {
 
 	is_shown = {
 		is_landed = yes
-		NOR = {
+		NOT = {
-			faith = {
-				has_doctrine = special_doctrine_immaterial_harmony
-			}
 			faith = {
 				any_faith_holy_order = {
 					holy_order_patron = root
@@ -32,6 +16,12 @@ create_holy_order_decision = {
 				}
 			}
 		}
+
+		#trigger_if = {
+		#	limit = { faith = { has_doctrine_parameter = no_holy_orders_til_hof } }
+		#	exists = faith.religious_head
+		#}
+
 		# Jomsvikings should use their special decision if appropriate.
 		trigger_if = {
 			limit = { has_fp1_dlc_trigger = yes }
@@ -93,6 +83,19 @@ create_holy_order_decision = {
 	}
 
 	is_valid = {
+		trigger_if = {
+			limit = {
+				faith = {
+					has_doctrine = doctrine_holy_order_head
+					NOT = {
+						exists = religious_head
+					}
+				}
+			}
+			can_create_head_of_faith_title_trigger = {
+				FAITH = this.faith
+			}
+		}
 		trigger_if = {
 			limit = {
 				any_character_struggle = {
@@ -120,7 +123,7 @@ create_holy_order_decision = {
 		trigger_if = {
 			limit = {
 				exists = faith.religious_head
-				root != root.faith.religious_head
+				NOT = { root = root.faith.religious_head }
 			}
 			faith.religious_head = {
 				opinion = {
@@ -148,22 +151,7 @@ create_holy_order_decision = {
 	}
 	cost = {
 		gold = {
-			value = 0
+			value = holy_order_gold_cost
-			if = {
-				limit = {
-					has_treasury = no
-				}
-				add = holy_order_gold_cost
-			}
-		}
-		treasury = {
-			value = 0
-			if = {
-				limit = {
-					has_treasury = yes
-				}
-				add = holy_order_gold_cost
-			}
 		}
 		piety = {
 			value = holy_order_piety_cost
@@ -179,7 +167,7 @@ create_holy_order_decision = {
 			}
 			hidden_effect = {
 				if = {
-					limit = { scope:barony.holder != root }
+					limit = { NOT = { scope:barony.holder = root } }
 					create_title_and_vassal_change = {
 						type = leased_out
 						save_scope_as = change
@@ -207,16 +195,46 @@ create_holy_order_decision = {
 				NEW_HO_SCOPE = new_holy_order
 				FOUNDER = root
 			}
+			
+			#if a ho_hof faith creates a ho and they don't have a hof yet, make it their hof
+			if = {
+				limit = {
+					faith = {
+						has_doctrine = doctrine_holy_order_head
+						NOT = {
+							exists = religious_head
+						}
+					}
+				}
+				faith = {
+					set_religious_head_title = scope:new_holy_order.title
+					create_head_of_faith_title_effect = yes
+					#TODO add events to inform faithful
+				}
+			}
 		}
 		create_holy_order_effect = yes
 	}
 	
 	ai_potential = {
+
+		OR = {
 			highest_held_title_tier >= tier_kingdom
+			AND = {
+				highest_held_title_tier >= tier_duchy
+				faith = {
+					has_doctrine = doctrine_holy_order_head
+					NOT = {
+						exists = religious_head
+					}
+				}
+			}
+		}
 		is_playable_character = yes
+
 		OR = {
 			any_held_title = {
-				title_tier = barony
+				tier = tier_barony
 				barony_is_valid_for_holy_order_lease_trigger = { CHARACTER = root }
 			}
 			any_vassal = {
@@ -240,35 +258,18 @@ create_holy_order_decision = {
 				}
 			}
 		}
-		modifier = {
+
-			government_has_flag = government_is_mandala
-			add = -150
-		}
 	}
 }
 
-### Borrow Gold from Holy Order ###
 borrow_from_holy_order_decision = { #by Linnéa Thimrén
-	picture = {
-		trigger = { 
-			culture = { has_graphical_india_culture_group_trigger = yes }
-		}
-		reference = "gfx/interface/illustrations/decisions/hindu_religious.dds"
-	}
 	picture = {
 		reference = "gfx/interface/illustrations/decisions/decision_spend_money.dds"
 	}
 	desc = borrow_from_holy_order_decision_desc
 	selection_tooltip = borrow_from_holy_order_decision_tooltip
 
-	ai_check_interval_by_tier = {
+	ai_check_interval = 72
-		barony = 0
-		county = 72
-		duchy = 72
-		kingdom = 72
-		empire = 72
-		hegemony = 72
-	}
 
 	cost = {
 		piety = 50
@@ -280,9 +281,10 @@ borrow_from_holy_order_decision = { #by Linnéa Thimrén
 		is_playable_character = yes
 		highest_held_title_tier > tier_barony
 		faith = {
-			any_faith_holy_order = { count >= 1 } #Your faith must have a Holy Order
+			any_faith_holy_order = { #Your faith must have a Holy Order
+				always = yes
+			}
 		}
-		# cannot already have a loan - keep it simple
 		NOR = {
 			exists = var:loan_amount_owed
 			exists = var:loan_holder
@@ -297,9 +299,6 @@ borrow_from_holy_order_decision = { #by Linnéa Thimrén
 				any_faith_holy_order = {
 					leader = {
 						gold >= holy_order_gold_value
-						NOT = {
-							has_any_bad_relationship_with_character_trigger = { CHARACTER = root }
-						}
 					}
 				}
 			}
@@ -308,23 +307,30 @@ borrow_from_holy_order_decision = { #by Linnéa Thimrén
 
 	effect = {
 		hidden_effect = {
+			set_variable = {
+				name = amount_to_loan
+				value = holy_order_gold_value
+				days = 1
+			}
+			add_character_flag = {
+				flag = borrow_from_holy_order
+				days = 3560
+			}
 			faith = {
 				random_faith_holy_order = {
 					limit = {
+						leader = { gold >= holy_order_gold_value }
+					}
 					leader = {
-							gold >= holy_order_gold_value
+						save_scope_as = recipient
-							NOT = {
-								has_any_bad_relationship_with_character_trigger = { CHARACTER = root }
 					}
-						}
-					}
-					leader = { save_scope_as = recipient }
 					save_scope_as = order
 				}
 			}
 			trigger_event = holy_order.0200
 		}
 		custom_tooltip = borrow_from_holy_order_decision_effect_tooltip
+
 	}
 	
 	ai_potential = {
@@ -342,14 +348,7 @@ borrow_from_holy_order_decision = { #by Linnéa Thimrén
 	}
 }
 
-### Revoke Holy Order Lease ###
 cancel_holy_order_lease_decision = {
-	picture = {
-		trigger = { 
-			culture = { has_graphical_india_culture_group_trigger = yes }
-		}
-		reference = "gfx/interface/illustrations/decisions/hindu_soldiers.dds"
-	}
 	picture = {
 		reference = "gfx/interface/illustrations/decisions/decision_major_religion.dds"
 	}
@@ -370,22 +369,17 @@ cancel_holy_order_lease_decision = {
 		}
 	}
 
-	ai_check_interval_by_tier = {
+	ai_check_interval = 36
-		barony = 0
-		county = 36
-		duchy = 36
-		kingdom = 36
-		empire = 36
-		hegemony = 36
-	}
 
 	is_shown = {
 		is_landless_adventurer = no
 		is_playable_character = yes
 
 		any_sub_realm_barony = {
-			barony_is_valid_for_holy_order_lease_cancellation_trigger = { ACTOR = root }
+			barony_is_valid_for_holy_order_lease_cancellation_trigger = yes
+			county.holder = root
 		}
+
 	}
 
 	widget = {
@@ -393,7 +387,7 @@ cancel_holy_order_lease_decision = {
 		barony_valid = {
 			trigger_if = {
 				limit = { exists = this }
-				barony_is_valid_for_holy_order_lease_cancellation_trigger =  { ACTOR = root }
+				barony_is_valid_for_holy_order_lease_cancellation_trigger = yes
 			}
 			trigger_else = {
 				custom_description = {
@@ -409,6 +403,19 @@ cancel_holy_order_lease_decision = {
 		is_at_war = no
 	}
 
+	cost = {
+		piety = {
+			value = 0
+			if = {
+				limit = {
+					exists = scope:barony
+					scope:barony.lessee.faith = root.faith
+				}
+				add = cancel_holy_order_piety_cost
+			}
+		}
+	}
+
 	effect = {
 		revoke_holy_order_lease_effect = {
 			CHARACTER = root
@@ -428,7 +435,7 @@ cancel_holy_order_lease_decision = {
 			#every_ruler = {
 			#	limit = {
 			#		faith = scope:holy_order_creator.faith
-			#		this != scope:holy_order_creator
+			#		NOT = { this = scope:holy_order_creator }
 			#	}
 			#	send_interface_message = {
 			#		type = holy_order_founded_message
@@ -439,7 +446,7 @@ cancel_holy_order_lease_decision = {
 			#}
 			#every_neighboring_top_liege_realm_owner = {
 			#	limit = {
-			#		faith != scope:holy_order_creator.faith
+			#		NOT = { faith = scope:holy_order_creator.faith }
 			#	}
 			#	send_interface_message = {
 			#		type = enemy_holy_order_founded_message
@@ -452,11 +459,26 @@ cancel_holy_order_lease_decision = {
 	}
 	
 	ai_potential = {
+		OR = {
+			faith:principlist.religious_head_title = { title_held_years > 0 }
+			AND = {
+				is_landed = yes
+				highest_held_title_tier >= tier_county
+				any_sub_realm_barony = {
+					county.holder = { is_ai = yes }
+					is_under_holy_order_lease = yes
+				}
+			}
+
+			AND = {
 				is_playable_character = yes
 				highest_held_title_tier >= tier_county
 				any_sub_realm_barony = {
 					county.holder = { is_ai = yes }
 					is_under_holy_order_lease = yes
+
+				}
+			}
 		}
 	}
 
@@ -466,7 +488,9 @@ cancel_holy_order_lease_decision = {
 		modifier = {
 			add = 100
 			exists = scope:barony.lessee
-			scope:barony.lessee.faith != root.faith
+			NOT = {
+				scope:barony.lessee.faith = root.faith
+			}
 		}
 		# Revoke if cynical
 		modifier = {
@@ -480,6 +504,10 @@ cancel_holy_order_lease_decision = {
 					}
 				}
 			}
+			#but don't revoke your HoF!
+			NOT = {
+				root.faith.religious_head = scope:barony.lessee
+			}
 		}
 	}
 }

common/decisions/major_decisions_NEOW.txt

@@ -52,7 +52,7 @@ restore_european_union_decision = {
 			has_government = administrative_government
 		}
 		any_held_title = {
-			geographical_region = world_europe
+			region = world_europe
 		}
 	}
 

common/religion/doctrine_types/30_core_tenets.txt

@@ -3998,25 +3998,25 @@
 				multiply = faith_unchanged_doctrine_cost_mult
 			}
 			# Multiplier for traditional mountain-based religions or faiths.
-#			if = {
+			if = {
-#				limit = {
+				limit = {
-#					OR = {
+					OR = {
-#						this = faith:bosnian_church
+						this = faith:bosnian_church
-#						this = faith:armenian_apostolic
+						this = faith:armenian_apostolic
-#						this = faith:lamaism
+						this = faith:lamaism
-#						this = faith:vajrayana
+						this = faith:vajrayana
-#						this = faith:mahayana
+						this = faith:mahayana
-#						this = faith:haymanot
+						this = faith:haymanot
-#						religion = religion:basque_religion
+						religion = religion:basque_religion
-#						religion = religion:kushitism_religion
+						religion = religion:kushitism_religion
-#						religion = religion:zunism_religion
+						religion = religion:zunism_religion
-#						religion = religion:tani_religion
+						religion = religion:tani_religion
-#						religion = religion:qiangic_religion
+						religion = religion:qiangic_religion
-#						religion = religion:bon_religion
+						religion = religion:bon_religion
-#					}
+					}
-#				}
+				}
-#				multiply = faith_tenet_discount_mountain_background_value
+				multiply = faith_tenet_discount_mountain_background_value
-#			}
+			}
 		}
 
 		is_shown = { always = yes }

common/scripted_triggers/00_religious_triggers.txt

@@ -829,27 +829,27 @@ is_valid_heresy = {
 	#Depending on the origin faith's religion/religion group, there may have additional requirements for a heresy to be considered valid.
 	OR = {
 		#For Christian Faiths, the origin and heretical faiths must not both be Ecumenical (excepting the faiths which aren't technically ecumenical).
-#		AND = {
+		AND = {
-#			OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion }
+			OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion }
-#			NAND = {
+			NAND = {
-#				$ORIGIN_FAITH$ = {
+				$ORIGIN_FAITH$ = {
-#					has_doctrine = special_doctrine_ecumenical_christian
+					has_doctrine = special_doctrine_ecumenical_christian
-#					OR = {
+					OR = {
-#						this = faith:insular_celtic
+						this = faith:insular_celtic
-#						this = faith:bosnian_church
+						this = faith:bosnian_church
-#						this = faith:mozarabic_church
+						this = faith:mozarabic_church
-#					}
+					}
-#				}
+				}
-#				$HERETICAL_FAITH$ = {
+				$HERETICAL_FAITH$ = {
-#					has_doctrine = special_doctrine_ecumenical_christian
+					has_doctrine = special_doctrine_ecumenical_christian
-#					OR = {
+					OR = {
-#						this = faith:insular_celtic
+						this = faith:insular_celtic
-#						this = faith:bosnian_church
+						this = faith:bosnian_church
-#						this = faith:mozarabic_church
+						this = faith:mozarabic_church
-#					}
+					}
-#				}
+				}
-#			}
+			}
-#		}
+		}
 		AND = { #FP3: for Zoroastrianism, Bedhin faiths are never heresies of each other
 			religion_tag = zoroastrianism_religion
 			NAND = {

common/scripted_triggers/NEOW_religion_triggers.txt

@@ -11,7 +11,3 @@ doctrine_is_spiritual_type = {
 		has_doctrine = doctrine_holy_order_head
 	}
 }
-
-has_locked_hof = {
-	always = no
-}

common/traits/00_traits.txt

@@ -14029,12 +14029,12 @@ crusader_king = {
 				trigger = { NOT = { exists = this } }
 				desc = trait_crusader_king_fallback_desc
 			}
-#			triggered_desc = {
+			triggered_desc = {
-#				trigger = {
+				trigger = {
-#					faith = faith:nestorian
+					faith = faith:nestorian
-#				}
+				}
-#				desc = beth_nahrain_crusader_desc
+				desc = beth_nahrain_crusader_desc
-#			}
+			}
 			triggered_desc = {
 				trigger = { is_female = yes }
 				desc = trait_crusader_king_female_desc
@@ -14049,12 +14049,12 @@ crusader_king = {
 				trigger = { NOT = { exists = this } }
 				desc = trait_crusader_king_fallback_dead
 			}
-#			triggered_desc = {
+			triggered_desc = {
-#				trigger = {
+				trigger = {
-#					faith = faith:nestorian
+					faith = faith:nestorian
-#				}
+				}
-#				desc = nick_beth_nahrain
+				desc = nick_beth_nahrain
-#			}
+			}
 			triggered_desc = {
 				trigger = {
 					faith = { OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } }
@@ -14070,117 +14070,117 @@ crusader_king = {
 				trigger = { faith = { religion_tag = islam_religion } }
 				desc = trait_crusader_king_islam
 			}
-#			triggered_desc = {
+			triggered_desc = {
-#				trigger = {
+				trigger = {
-#					faith = { religion_tag = bon_religion }
+					faith = { religion_tag = bon_religion }
-#					is_female = yes
+					is_female = yes
-#				}
+				}
-#				desc = trait_crusader_king_bon_female
+				desc = trait_crusader_king_bon_female
-#			}
+			}
-#			triggered_desc = {
+			triggered_desc = {
-#				trigger = { faith = { religion_tag = bon_religion } }
+				trigger = { faith = { religion_tag = bon_religion } }
-#				desc = trait_crusader_king_bon_male
+				desc = trait_crusader_king_bon_male
-#			}
+			}
 			triggered_desc = {
 				trigger = { faith = { religion_tag = buddhism_religion } }
 				desc = trait_crusader_king_buddhism
 			}
-#			triggered_desc = {
+			triggered_desc = {
-#				trigger = { faith = { religion_tag = dualism_religion } }
+				trigger = { faith = { religion_tag = dualism_religion } }
-#				desc = trait_crusader_king_dualism
+				desc = trait_crusader_king_dualism
-#			}
+			}
 			triggered_desc = {
 				trigger = { faith = { religion_tag = folkgerman_religion } }
 				desc = trait_crusader_king_germanic
 			}
-#			triggered_desc = {
+			triggered_desc = {
-#				trigger = {
+				trigger = {
-#					faith = { religion_tag = hellenism_religion }
+					faith = { religion_tag = hellenism_religion }
-#					is_female = yes
+					is_female = yes
-#				}
+				}
-#				desc = trait_crusader_king_hellenism_female
+				desc = trait_crusader_king_hellenism_female
-#			}
+			}
-#			triggered_desc = {
+			triggered_desc = {
-#				trigger = { faith = { religion_tag = hellenism_religion } }
+				trigger = { faith = { religion_tag = hellenism_religion } }
-#				desc = trait_crusader_king_hellenism_male
+				desc = trait_crusader_king_hellenism_male
-#			}
+			}
-#			triggered_desc = {
+			triggered_desc = {
-#				trigger = { faith = { religion_tag = hinduism_religion } }
+				trigger = { faith = { religion_tag = hinduism_religion } }
-#				desc = trait_crusader_king_hinduism
+				desc = trait_crusader_king_hinduism
-#			}
+			}
-#			triggered_desc = {
+			triggered_desc = {
-#				trigger = { faith = { religion_tag = jainism_religion } }
+				trigger = { faith = { religion_tag = jainism_religion } }
-#				desc = trait_crusader_king_jainism
+				desc = trait_crusader_king_jainism
-#			}
+			}
 			triggered_desc = {
 				trigger = { faith = { religion_tag = judaism_religion } }
 				desc = trait_crusader_king_judaism
 			}
-#			triggered_desc = {
+			triggered_desc = {
-#				trigger = { faith = { religion_tag = magyar_religion } }
+				trigger = { faith = { religion_tag = magyar_religion } }
-#				desc = trait_crusader_king_magyar
+				desc = trait_crusader_king_magyar
-#			}
+			}
-#			triggered_desc = {
+			triggered_desc = {
-#				trigger = { faith = { religion_tag = baltic_religion } }
+				trigger = { faith = { religion_tag = baltic_religion } }
-#				desc = trait_crusader_king_baltic
+				desc = trait_crusader_king_baltic
-#			}
+			}
-#			triggered_desc = {
+			triggered_desc = {
-#				trigger = { faith = { religion_tag = slavic_religion } }
+				trigger = { faith = { religion_tag = slavic_religion } }
-#				desc = trait_crusader_king_slavic
+				desc = trait_crusader_king_slavic
-#			}
+			}
-#			triggered_desc = {
+			triggered_desc = {
-#				trigger = {
+				trigger = {
-#					faith = { religion_tag = finno_ugric_religion }
+					faith = { religion_tag = finno_ugric_religion }
-#					is_female = yes
+					is_female = yes
-#				}
+				}
-#				desc = trait_crusader_king_finno_ugric_female
+				desc = trait_crusader_king_finno_ugric_female
-#			}
+			}
-#			triggered_desc = {
+			triggered_desc = {
-#				trigger = { faith = { religion_tag = finno_ugric_religion } }
+				trigger = { faith = { religion_tag = finno_ugric_religion } }
-#				desc = trait_crusader_king_finno_ugric_male
+				desc = trait_crusader_king_finno_ugric_male
-#			}
+			}
-#			triggered_desc = {
+			triggered_desc = {
-#				trigger = { faith = { religion_tag = siberian_religion } }
+				trigger = { faith = { religion_tag = siberian_religion } }
-#				desc = trait_crusader_king_siberian
+				desc = trait_crusader_king_siberian
-#			}
+			}
-#			triggered_desc = {
+			triggered_desc = {
-#				trigger = {
+				trigger = {
-#					faith = { religion_tag = tengrism_religion }
+					faith = { religion_tag = tengrism_religion }
-#					is_female = yes
+					is_female = yes
-#				}
+				}
-#				desc = trait_crusader_king_tengrism_female
+				desc = trait_crusader_king_tengrism_female
-#			}
+			}
-#			triggered_desc = {
+			triggered_desc = {
-#				trigger = { faith = { religion_tag = tengrism_religion } }
+				trigger = { faith = { religion_tag = tengrism_religion } }
-#				desc = trait_crusader_king_tengrism_male
+				desc = trait_crusader_king_tengrism_male
-#			}
+			}
-#			triggered_desc = {
+			triggered_desc = {
-#				trigger = { faith = { religion_tag = west_african_religion } }
+				trigger = { faith = { religion_tag = west_african_religion } }
-#				desc = trait_crusader_king_west_african
+				desc = trait_crusader_king_west_african
-#			}
+			}
-#			triggered_desc = {
+			triggered_desc = {
-#				trigger = { faith = { religion_tag = west_african_bori_religion } }
+				trigger = { faith = { religion_tag = west_african_bori_religion } }
-#				desc = trait_crusader_king_west_african_bori
+				desc = trait_crusader_king_west_african_bori
-#			}
+			}
-#			triggered_desc = {
+			triggered_desc = {
-#				trigger = { faith = { religion_tag = west_african_roog_religion } }
+				trigger = { faith = { religion_tag = west_african_roog_religion } }
-#				desc = trait_crusader_king_west_african_roog
+				desc = trait_crusader_king_west_african_roog
-#			}
+			}
-#			triggered_desc = {
+			triggered_desc = {
-#				trigger = { faith = { religion_tag = zoroastrianism_religion } }
+				trigger = { faith = { religion_tag = zoroastrianism_religion } }
-#				desc = trait_crusader_king_zoroastrianism
+				desc = trait_crusader_king_zoroastrianism
-#			}
+			}
-#			triggered_desc = {
+			triggered_desc = {
-#				trigger = {
+				trigger = {
-#					faith = { religion_tag = zunism_religion }
+					faith = { religion_tag = zunism_religion }
-#					is_female = yes
+					is_female = yes
-#				}
+				}
-#				desc = trait_crusader_king_zunism_female
+				desc = trait_crusader_king_zunism_female
-#			}
+			}
-#			triggered_desc = {
+			triggered_desc = {
-#				trigger = { faith = { religion_tag = zunism_religion } }
+				trigger = { faith = { religion_tag = zunism_religion } }
-#				desc = trait_crusader_king_zunism_male
+				desc = trait_crusader_king_zunism_male
-#			}
+			}
 
 			triggered_desc = {
 				trigger = { is_female = yes }

events/activities/coronation_activity/coronation_events_6.txt

@@ -4709,12 +4709,8 @@ coronation_events.6100 = {
 						triggered_desc = {
 							trigger = {
 								scope:activity.var:activity_special_type_progression >= 25
-								scope:host = {
+								scope:host.faith.religion = {
-														OR = { 
+									this = religion:christianity_religion
-						faith.religion = religion:eastern_orthodox_religion 
-						faith.religion = religion:catholic_religion 
-						faith.religion = religion:protestant_religion 
-					}
 								}
 								scope:host = {
 									OR = {
@@ -4735,12 +4731,8 @@ coronation_events.6100 = {
 						triggered_desc = {
 							trigger = {
 								scope:activity.var:activity_special_type_progression >= 25
-								scope:host = {
+								scope:host.faith.religion = {
-														OR = { 
+									this = religion:christianity_religion
-						faith.religion = religion:eastern_orthodox_religion 
-						faith.religion = religion:catholic_religion 
-						faith.religion = religion:protestant_religion 
-					}
 								}
 								scope:host = {
 									OR = {
@@ -4771,12 +4763,8 @@ coronation_events.6100 = {
 						}
 						triggered_desc = {
 							trigger = {
-								scope:host = {
+								scope:host.faith.religion = {
-														OR = { 
+									this = religion:christianity_religion
-						faith.religion = religion:eastern_orthodox_religion 
-						faith.religion = religion:catholic_religion 
-						faith.religion = religion:protestant_religion 
-					}
 								}
 							}
 							desc = coronation_events.6100.desc_christian

events/activities/pilgrimage_activity/pilgrimage_events.txt

@@ -11613,11 +11613,7 @@ pilgrimage.6760 = {
 			any_secret = { type = secret_non_believer }
 		}
 		location.county.holder.cp:councillor_court_chaplain ?= {
-					OR = {
+			faith.religion ?= religion:christianity_religion
-			faith.religion = religion:eastern_orthodox_religion 
-			faith.religion = religion:catholic_religion 
-			faith.religion = religion:protestant_religion 
-		}
 			OR = {
 				NOR = {
 					faith = faith:orthodox

events/decisions_events/east_europe_events.txt

@@ -430,9 +430,7 @@ east_europe.0032 = {
 		trigger = {
 			scope:old_faith.religion = {
 				OR = {
-					this = religion:eastern_orthodox_religion
+					this = religion:christianity_religion
-					this = religion:catholic_religion
-					this = religion:protestant_religion
 					this = religion:islam_religion
 					this = religion:judaism_religion
 					is_in_family = rf_eastern
@@ -757,11 +755,7 @@ scripted_trigger generic_invalidation_criteria_trigger = {
 				}
 				#Scope:heretic has converted to a different Abrahamic religion.
 				faith.religion = {
-					NOR = {
+					NOT = { this = religion:christianity_religion }
-					this = religion:eastern_orthodox_religion
-					this = religion:catholic_religion
-					this = religion:protestant_religion
-					}
 					is_in_family = rf_abrahamic
 				}
 				#Scope:heretic has converted to a totally different religious family.
@@ -2336,9 +2330,7 @@ east_europe.0123 = {
 			limit = {
 				scope:heretic = {
 					faith.religion = {
-						NOR = { 					this = religion:eastern_orthodox_religion
+						NOT = { this = religion:christianity_religion }
-					this = religion:catholic_religion
-					this = religion:protestant_religion }
 						is_in_family = rf_abrahamic
 					}
 				}
@@ -2552,9 +2544,7 @@ east_europe.0124 = {
 			limit = {
 				scope:heretic = {
 					faith.religion = {
-						NOR = { 					this = religion:eastern_orthodox_religion
+						NOT = { this = religion:christianity_religion }
-					this = religion:catholic_religion
-					this = religion:protestant_religion }
 						is_in_family = rf_abrahamic
 					}
 				}

events/dlc/ach/ach_coronation_events.txt

@@ -8369,11 +8369,7 @@ ach_coronation.0027 = {
 			AND = { # If a European Christian, the crusades are going on
 				location = { geographical_region = world_europe }
 				religion = {
-					OR = {
+					this = religion:christianity_religion
-										this = religion:eastern_orthodox_religion
-					this = religion:catholic_religion
-					this = religion:protestant_religion
-					}
 					exists = var:variable_ghw_unlocked
 				}
 			}
@@ -8416,9 +8412,7 @@ ach_coronation.0027 = {
 			factor = 3
 			faith = {
 				has_variable = variable_ghw_cooldown # There was a recent crusade
-				religion = {OR = { 					this = religion:eastern_orthodox_religion
+				religion = { this = religion:christianity_religion }
-					this = religion:catholic_religion
-					this = religion:protestant_religion } }
 			}
 		}
 	}

events/dlc/ep3/ep3_governor_yearly_3.txt

@@ -5282,11 +5282,7 @@ ep3_governor_yearly.3060 = {
 				trigger = {
 					scope:emperor = {
 						religion = {
-							OR = {
+							this = religion:christianity_religion
-												this = religion:eastern_orthodox_religion
-					this = religion:catholic_religion
-					this = religion:protestant_religion
-							}
 						}
 						primary_title = {
 							this = title:e_byzantium
@@ -5323,11 +5319,7 @@ ep3_governor_yearly.3060 = {
 				trigger = {
 					scope:emperor = {
 						religion = {
-							OR = {
+							this = religion:christianity_religion
-												this = religion:eastern_orthodox_religion
-					this = religion:catholic_religion
-					this = religion:protestant_religion
-							}
 						}
 						primary_title = {
 							this = title:e_byzantium

events/dlc/ep3/ep3_interactions_events.txt

@@ -4407,11 +4407,7 @@ ep3_interactions_events.0620 = { # Ask for Influence accepted letter
 			triggered_desc = {
 				trigger = {
 					faith.religion = {
-						OR = {
+						this = religion:christianity_religion
-											this = religion:eastern_orthodox_religion
-					this = religion:catholic_religion
-					this = religion:protestant_religion
-					}
 					}
 				}
 				desc = ep3_interactions_events.0620.desc_byz

events/dlc/fp2/fp2_yearly_events.txt

@@ -6122,13 +6122,9 @@ fp2_yearly.9001 = {
 	}
 
 	trigger = {
-		root.religion = {
+		root.religion = religion:christianity_religion
-			OR = {
-								this = religion:eastern_orthodox_religion
-					this = religion:catholic_religion
-					this = religion:protestant_religion
-			}
 		is_landed = yes
+		NOT = { faith = faith:conversos }
 	}
 
 	weight_multiplier = {
@@ -6323,9 +6319,7 @@ fp2_yearly.9001 = {
 							faith = {
 								religion = {
 									OR = {
-															this = religion:eastern_orthodox_religion
+										this = religion:christianity_religion
-					this = religion:catholic_religion
-					this = religion:protestant_religion
 										this = religion:judaism_religion
 									}
 								}

gfx/interface/illustrations/scripted_illustrations/ingame.txt

@@ -1380,12 +1380,7 @@ character_view_bg = {
 		trigger = {
 			involved_activity ?= { has_activity_type = activity_feast }
 			location ?= involved_activity.activity_location
-			involved_activity.activity_location.culture = {
+			involved_activity.activity_location.culture = { has_building_gfx = byzantine_building_gfx }
-				OR = {
-					has_building_gfx = byzantine_building_gfx
-					has_building_gfx = caucasian_building_gfx
-				}
-			}
 		}
 	}
 
@@ -1526,12 +1521,7 @@ character_view_bg = {
 		trigger = {
 			involved_activity ?= { has_activity_type = activity_feast }
 			location ?= involved_activity.activity_location
-			involved_activity.activity_location.culture = {
+			involved_activity.activity_location.culture = { has_building_gfx = indian_building_gfx }
-				OR = {
-					has_building_gfx = indian_building_gfx
-					has_building_gfx = tibetan_building_gfx
-				}
-			}
 		}
 	}
 
@@ -1541,12 +1531,7 @@ character_view_bg = {
 		trigger = {
 			involved_activity ?= { has_activity_type = activity_feast }
 			location ?= involved_activity.activity_location
-			involved_activity.activity_location.culture = {
+			involved_activity.activity_location.culture = { has_building_gfx = indian_building_gfx }
-				OR = {
-					has_building_gfx = indian_building_gfx
-					has_building_gfx = tibetan_building_gfx
-				}
-			}
 			is_character_window_main_character = yes
 		}
 	}
@@ -1561,12 +1546,7 @@ character_view_bg = {
 					primary_spouse = {
 						involved_activity ?= { has_activity_type = activity_feast }
 						location ?= involved_activity.activity_location
-						involved_activity.activity_location.culture = {
+						involved_activity.activity_location.culture = { has_building_gfx = indian_building_gfx }
-							OR = {
-								has_building_gfx = indian_building_gfx
-								has_building_gfx = tibetan_building_gfx
-							}
-						}
 					}
 				}
 				AND = {
@@ -1574,12 +1554,7 @@ character_view_bg = {
 					betrothed = {
 						involved_activity ?= { has_activity_type = activity_feast }
 						location ?= involved_activity.activity_location
-						involved_activity.activity_location.culture = {
+						involved_activity.activity_location.culture = { has_building_gfx = indian_building_gfx }
-							OR = {
-								has_building_gfx = indian_building_gfx
-								has_building_gfx = tibetan_building_gfx
-							}
-						}
 					}
 				}
 				AND = {
@@ -1587,12 +1562,7 @@ character_view_bg = {
 					liege ?= {
 						involved_activity ?= { has_activity_type = activity_feast }
 						location ?= involved_activity.activity_location
-						involved_activity.activity_location.culture = {
+						involved_activity.activity_location.culture = { has_building_gfx = indian_building_gfx }
-							OR = {
-								has_building_gfx = indian_building_gfx
-								has_building_gfx = tibetan_building_gfx
-							}
-						}
 					}
 				}
 			}
@@ -10625,13 +10595,31 @@ character_view_bg = {
 
 	##########################################
 
+	# Japan, Emperor
+	texture = {
+		reference = "event_scenes/tgp_japan_throne_room.dds"
+
+		trigger = {
+			primary_title ?= title:e_japan
+		}
+	}
+
+	environment = {
+		reference = "environment_tgp_frontend_celestial_main"
+
+		trigger = {
+			primary_title ?= title:e_japan
+		}
+	}
+
+	##########################################
+
 	# East Asia, high rank
 	texture = {
 		reference = "event_scenes/tgp_asia_throne_room.dds"
 
 		trigger = {
 			high_tier_throne_room_trigger = { REGION = east_asia }
-			culture = { has_graphical_east_asia_culture_group_trigger = yes }
 		}
 	}
 
@@ -10640,7 +10628,6 @@ character_view_bg = {
 
 		trigger = {
 			high_tier_throne_room_trigger = { REGION = east_asia }
-			culture = { has_graphical_east_asia_culture_group_trigger = yes }
 		}
 	}
 

gui/debug/window_component_library.gui

@@ -67,11 +67,6 @@ window = {
 
                 onclick = "[GetVariableSystem.Set( 'ui_library_tabs', 'action_buttons' )]"
                 down = "[GetVariableSystem.HasValue( 'ui_library_tabs', 'action_buttons' )]"
-
-                blockoverride "icon_visible" 
-                {
-                    visible = no
-                }
             }
 
             button_tab = {
@@ -80,11 +75,6 @@ window = {
 
                 onclick = "[GetVariableSystem.Set( 'ui_library_tabs', 'other_inputs' )]"
                 down = "[GetVariableSystem.HasValue( 'ui_library_tabs', 'other_inputs' )]"
-
-                blockoverride "icon_visible" 
-                {
-                    visible = no
-                }
             }
 
             button_tab = {
@@ -93,11 +83,6 @@ window = {
 
                 onclick = "[GetVariableSystem.Set( 'ui_library_tabs', 'view_controls' )]"
                 down = "[GetVariableSystem.HasValue( 'ui_library_tabs', 'view_controls' )]"
-
-                blockoverride "icon_visible" 
-                {
-                    visible = no
-                }
             }
 
             button_tab = {
@@ -106,13 +91,7 @@ window = {
 
                 onclick = "[GetVariableSystem.Set( 'ui_library_tabs', 'selectors' )]"
                 down = "[GetVariableSystem.HasValue( 'ui_library_tabs', 'selectors' )]"
-
-                blockoverride "icon_visible" 
-                {
-                    visible = no
             }
-            }
-
             button_tab = {
                 layoutpolicy_horizontal = expanding
 
@@ -120,11 +99,6 @@ window = {
 
                 onclick = "[GetVariableSystem.Set( 'ui_library_tabs', 'separators' )]"
                 down = "[GetVariableSystem.HasValue( 'ui_library_tabs', 'separators' )]"
-
-                blockoverride "icon_visible" 
-                {
-                    visible = no
-                }
             }
 
             button_tab = {
@@ -134,11 +108,6 @@ window = {
 
                 onclick = "[GetVariableSystem.Set( 'ui_library_tabs', 'indicators' )]"
                 down = "[GetVariableSystem.HasValue( 'ui_library_tabs', 'indicators' )]"
-
-                blockoverride "icon_visible" 
-                {
-                    visible = no
-                }
             }
 
             button_tab = {
@@ -148,11 +117,6 @@ window = {
 
                 onclick = "[GetVariableSystem.Set( 'ui_library_tabs', 'text_formats' )]"
                 down = "[GetVariableSystem.HasValue( 'ui_library_tabs', 'text_formats' )]"
-
-                blockoverride "icon_visible" 
-                {
-                    visible = no
-                }
             }
 
             button_tab = {
@@ -161,11 +125,6 @@ window = {
 
                 onclick = "[GetVariableSystem.Set( 'ui_library_tabs', 'portraits' )]"
                 down = "[GetVariableSystem.HasValue( 'ui_library_tabs', 'portraits' )]"
-
-                blockoverride "icon_visible" 
-                {
-                    visible = no
-                }
             }
 
             button_tab = {
@@ -174,11 +133,6 @@ window = {
 
                 onclick = "[GetVariableSystem.Set( 'ui_library_tabs', 'coas' )]"
                 down = "[GetVariableSystem.HasValue( 'ui_library_tabs', 'coas' )]"
-
-                blockoverride "icon_visible" 
-                {
-                    visible = no
-                }
             }
 
             #button_tab = {
@@ -196,11 +150,6 @@ window = {
 
                 onclick = "[GetVariableSystem.Set( 'ui_library_tabs', 'animations' )]"
                 down = "[GetVariableSystem.HasValue( 'ui_library_tabs', 'animations' )]"
-
-                blockoverride "icon_visible" 
-                {
-                    visible = no
-                }
             }
 
             button_tab = {
@@ -209,11 +158,6 @@ window = {
 
                 onclick = "[GetVariableSystem.Set( 'ui_library_tabs', 'placeholders' )]"
                 down = "[GetVariableSystem.HasValue( 'ui_library_tabs', 'placeholders' )]"
-
-                blockoverride "icon_visible" 
-                {
-                    visible = no
-                }
             }
         }
 

gui/shared/lists.gui

@@ -137,7 +137,7 @@ types Lists
 
 		hbox = {
 			margin = { 0 5 }
-			spacing = 10
+			spacing = 15
 
 			portrait_head_small = {}
 
@@ -332,10 +332,44 @@ types Lists
 									}
 								}
 
-								block "traits_grid" {
 								# Traits
-									fixedgrid_traits_list = {
+								fixedgridbox = {
 									name = "traits_grid"
+									datamodel = "[CharacterListItem.GetTraits]"
+									flipdirection = yes
+									size = { 150 35 }
+									addcolumn = 30
+									addrow = 35
+									block "horizontal_slots"
+									{
+										maxhorizontalslots = 8
+									}
+									maxverticalslots = 1
+
+									item = {
+										widget = {
+											visible = "[Trait.IsValid]"
+											size = { 35 35 }
+
+											icon_trait = {
+												parentanchor = center
+
+												blockoverride "icon_size"
+												{
+													size = { 30 30 }
+												}
+
+												blockoverride "tooltip_placement"
+												{
+													using = tooltip_se
+												}
+
+												blockoverride "glow_radius"
+												{
+													glow_radius = 3
+												}
+											}
+										}
 									}
 								}
 
@@ -353,15 +387,13 @@ types Lists
 										widget = {
 											datacontext = "[CharacterListItem.GetFirstClaim]"
 											visible = "[Not( IsDataModelEmpty( CharacterListItem.GetTitleItems ) )]"
-											size = { 55 44 }
+											size = { 55 58 }
 	
 											block "claims_visibility" {}
 	
 											coa_title_tiny_crown = {
 												datacontext = "[Claim.GetTitle]"
 												using = tooltip_ne
-												parentanchor = vcenter
-												position = { 0 -3 }
 	
 												highlight_icon = {
 													name = "pressed_claim"
@@ -398,7 +430,7 @@ types Lists
 												position = { 0 -6 }
 	
 												text = "[CharacterListItem.GetTitleItemCount]"
-												align = center
+												align = right
 												minimumsize = { 15 0 }
 	
 												tooltip = "CHARACTER_LIST_CLAIM_TOOLTIP"
@@ -442,45 +474,6 @@ types Lists
 		}
 	}
 
-	type fixedgrid_traits_list = fixedgridbox {
-		datamodel = "[CharacterListItem.GetTraits]"
-		flipdirection = yes
-		size = { 150 35 }
-		addcolumn = 30
-		addrow = 35
-		block "horizontal_slots"
-		{
-			maxhorizontalslots = 8
-		}
-		maxverticalslots = 1
-		
-		item = {
-			widget = {
-				visible = "[Trait.IsValid]"
-				size = { 35 35 }
-				
-				icon_trait = {
-					parentanchor = center
-					
-					blockoverride "icon_size"
-					{
-						size = { 30 30 }
-					}
-					
-					blockoverride "tooltip_placement"
-					{
-						using = tooltip_se
-					}
-					
-					blockoverride "glow_radius"
-					{
-						glow_radius = 3
-					}
-				}
-			}
-		}
-	}
-
 
 	type widget_character_list_item_finder = widget {
 		datacontext = "[CharacterListItem.GetCharacter]"
@@ -538,7 +531,6 @@ types Lists
 								}
 							}
 
-							block "character_name_relationship" {
 							hbox = {
 								margin_left = 3
 								layoutpolicy_horizontal = expanding
@@ -549,10 +541,8 @@ types Lists
 									align = nobaseline
 									text = "[Character.GetUINameNoTooltip|U]"
 									fontsize_min = 14
-										block "character_name_width" {
 									max_width = 300
 								}
-									}
 
 								block "character_relation"
 								{
@@ -579,7 +569,7 @@ types Lists
 
 								expand = {}
 							}
-							}
+
 							hbox = {
 								using = character_age_or_death_text
 							}
@@ -1107,8 +1097,6 @@ types Lists
 			spacing = 5
 		}
 
-		block "pre_filters" {}
-
 		button_standard = {
 			name = "filters"
 			size = { 25 25 }
@@ -1170,8 +1158,6 @@ types Lists
 			}
 		}
 
-		block "post_sort" {}
-
 		expand = {}
 
 		block "skill_sort_buttons"
@@ -1965,54 +1951,274 @@ types Lists
 		}
 	}
 
-	type widget_compact_vassal_list_item = widget {
+	type widget_republic_vassal_list_item = widget {
-		size = { 80 118 }
 		datacontext = "[CharacterListItem.GetCharacter]"
 
-		widget = {
+		vbox = {
-			size = { 85 100% }
+			margin = { 5 0 }
-			parentanchor = hcenter
-			
 			background = {
-				using = Background_Area_Border_Solid
+				using = Background_Area_With_Header
 			}
-			background = {
-				using = Background_Frame
-			}
-		}
-		
-		widget = {
-			parentanchor = bottom|hcenter
-			size = { 100% 30 }
 
 			hbox = {
 				layoutpolicy_horizontal = expanding
-				margin = { 5 0 }
+				margin = { 5 5 }
-				margin_bottom = 5
-				visible = "[Character.HasLandedTitles]"
-				
-				text_single = {
-					raw_text = "@soldier_icon!"
-					align = nobaseline
-					using = Font_Size_Tiny
-				}
 
 				text_single = {
 					layoutpolicy_horizontal = expanding
-					align = nobaseline|center
+					text = "[Character.GetUINameNoTooltip|U]"
+					using = Font_Size_Medium
 					autoresize = no
-					text = "[Character.GetCurrentMilitaryStrength]"
+					fontsize_min = 13
-					tooltip = "[CharacterListItem.GetMilitaryStrengthTooltip]"
+					align = nobaseline
+					max_width = 340
+				}
+
+				expand = {}
+
+				hbox_skills_grid = {}
+			}
+
+			hbox = {
+				layoutpolicy_horizontal = expanding
+				spacing = 5
+
+				portrait_head_small = {}
+
+				vbox = {
+					layoutpolicy_horizontal = expanding
+					layoutpolicy_vertical = expanding
+					margin_right = 5
+
+					hbox = {
+						layoutpolicy_horizontal = expanding
+
+						vbox = {
+							layoutpolicy_horizontal = expanding
+
+							margin_top = 3
+
+							hbox = {
+								layoutpolicy_horizontal = expanding
+
+								text_single = {
+									name = "character_relation"
+									visible = "[Or(Character.GetLiege.IsLocalPlayer, Character.GetSuzerain.IsLocalPlayer)]"
+									layoutpolicy_horizontal = expanding
+									text = "[Character.GetRelationToString(GetPlayer)]"
+									tooltip = "EXTENDED_RELATIONS_TOOLTIP"
 									default_format = "#low"
+									autoresize = no
+									fontsize_min = 13
+									align = nobaseline
+									max_width = 420
+								}
+
+								expand = {}
+							}
+
+							hbox = {
+								layoutpolicy_horizontal = expanding
+								spacing = 5
+
+								text_single = {
+									visible = "[And( Character.HasOverlord, And( Character.UsesObedience, Character.IsObedientTo( Character.GetOverlord ) ) )]"
+
+									text = "MY_REALM_WINDOW_OBEDIENT"
+									align = nobaseline
+									max_width = 170
+
+									tooltipwidget = widget_obedience_tooltip
+								}
+
+								text_single = {
+									visible = "[And( Character.HasOverlord, And( Character.UsesObedience, Not( Character.IsObedientTo( Character.GetOverlord ) ) ) )]"
+
+									text = "MY_REALM_WINDOW_DISOBEDIENT"
+									align = nobaseline
+									max_width = 170
+
+									tooltipwidget = widget_obedience_tooltip
+								}
+
+								divider_light = {
+									visible = "[Character.UsesObedience]"
+									layoutpolicy_vertical = expanding
+								}
+
+								vassal_stance_icon = {
+									name = "vassal_stance"
+									size = { 30 30 }
+								}
+
+								divider_light = {
+									visible = "[And( Character.IsVassalOf( GetPlayer ), Not( Character.IsPlayer ) )]"
+									layoutpolicy_vertical = expanding
+								}
+
+								vassal_expected_legitimacy_widget = {
+									name = "legitimacy_expectation"
+									size = { 30 30 }
+								}
+
+								block "realm_size_powerful_status" {
+									flowcontainer = {
+										spacing = 10
+
+										text_single = {
+											visible = "[NotEqualTo_int32(Character.GetPrimaryTitle.GetTierFrame, '(int32)2')]" #nonbaron
+											layoutpolicy_horizontal = expanding
+
+											text = "REALM_WINDOW_SIZE"
+											align = nobaseline
+											max_width = 150
+
+											tooltip = "REALM_WINDOW_SIZE_TT"
 										}
 									}
 								}
 
-		portrait_head_small = {
+								expand = {}
-			parentanchor = hcenter
+							}
+
+							block "vassal_buttons" {
+								hbox = {
+									visible = "[Character.IsPlayerInteractionShown('give_vassal_directive_interaction')]"
+									layoutpolicy_horizontal = expanding
+									spacing = 5
+
+
+									divider_light = {
+										visible = "[Character.IsPowerfulVassal]"
+										layoutpolicy_vertical = expanding
+									}
+
+									text_single = {
+										visible = "[Character.IsPowerfulVassal]"
+										layoutpolicy_horizontal = expanding
+
+										text = "MY_REALM_WINDOW_POWERFUL_VASSAL"
+										align = nobaseline
+										max_width = 200
+									}
+
+									expand = {}
+								}
 							}
 						}
 
+							block "own_vassal" {
+								vbox = {
+									visible = "[Character.GetLiege.IsLocalPlayer]"
+									layoutpolicy_vertical = expanding
+									margin_left = 10
+									hbox = {
+										visible = "[Character.GetGovernment.IsType('urbanrepublic_government')]"
+										spacing = 3
+										expand = {}
+										icon = {
+											name = "icon_influence"
+											size = { 30 30 }
+											texture = "[Character.GetInfluenceLevelTexture]"
+										}
+										text_single = {
+											name = "influence"
+											text = "[Character.GetInfluence|0]"
+											default_format = "#high"
+											align = center|nobaseline
+											fontsize_min = 12
+											max_width = 50
+										}
+										expand = {}
+									}
+									hbox = {
+										spacing = 3
+										expand = {}
+										icon = {
+											name = "prestige_icon"
+											size = { 30 30 }
+											texture = "[Character.GetPrestigeLevelTexture]"
+										}
+										text_single = {
+											name = "influence"
+											text = "[Character.GetPrestige|0]"
+											default_format = "#high"
+											align = center|nobaseline
+											fontsize_min = 12
+											max_width = 50
+										}
+										expand = {}
+									}
+									hbox = {
+										spacing = 3
+										expand = {}
+										icon = {
+											name = "icon_piety"
+											size = { 30 30 }
+											texture = "[Character.GetPietyLevelTexture]"
+										}
+										text_single = {
+											name = "piety"
+											text = "[Character.GetPiety|0]"
+											default_format = "#high"
+											align = center|nobaseline
+											fontsize_min = 12
+											max_width = 50
+										}
+										expand = {}
+									}
+									hbox = {
+										spacing = 3
+										expand = {}
+										icon = {
+											name = "icon_dynasty_prestige"
+											size = { 30 30 }
+											texture = "[Character.GetDynasty.GetDynastyPrestigeLevelTexture]"
+										}
+										text_single = {
+											name = "dynasty_prestige"
+											text = "[Character.GetDynasty.GetPrestige|0]"
+											default_format = "#high"
+											align = center|nobaseline
+											fontsize_min = 12
+											max_width = 50
+										}
+										expand = {}
+									}
+								}
+							}
+							block "own_vassal" {
+								vbox = {
+									visible = "[Character.GetLiege.IsLocalPlayer]"
+									layoutpolicy_vertical = expanding
+									margin_left = 10
+
+									hbox = {
+										coa_house_tiny = {
+											datacontext = "[Character.GetHouse]"
+											parentanchor = center
+										}
+									}
+									hbox = {
+										coa_title_tiny_crown = {
+											name = "allegiance_flag"
+											datacontext = "[Character.GetLiege.GetPrimaryTitle]"
+											visible = "[Title.IsValid]"
+
+											tooltip = "MRW_TITLE_ALLEGIANCE"
+											blockoverride "coa_tooltip" {}
+										}
+									}
+								}
+							}
+						
+						}
+					}
+				}
+			}
+			expand = {}
+		}
+	}
 	type hbox_tributary_information = hbox {
 		visible = "[Character.HasSuzerain]"
 
@@ -2335,17 +2541,11 @@ types Lists
 			### VASSAL GOLD
 			hbox = {
 				# Treasury Vassals don't pay in gold
-				visible = "[GreaterThan_CFixedPoint( MyRealmWindowVassalItem.GetContract.GetTaxRatioForLiege, '(CFixedPoint)0' )]"
+				visible = "[And( Not( SubjectContract.GetLiege.GetGovernment.HasGovernmentFlag( 'government_has_treasury' ) ), GreaterThan_CFixedPoint( MyRealmWindowVassalItem.GetContract.GetTaxRatioForLiege, '(CFixedPoint)0' ))]"
 
 				icon = {
 					size = { 25 25 }
 					texture = "gfx/interface/icons/icon_gold.dds"
-					visible = "[Not( SubjectContract.GetLiege.GetGovernment.HasGovernmentFlag( 'government_has_treasury' ) )]"
-				}
-				icon = {
-					size = { 25 25 }
-					texture = "gfx/interface/icons/icon_imperial_treasury.dds"
-					visible = "[SubjectContract.GetLiege.GetGovernment.HasGovernmentFlag( 'government_has_treasury' )]"
 				}
 
 				text_single = {
@@ -2662,7 +2862,7 @@ types Lists
 					datamodel = "[TraitArrays.GetTraits]"
 					visible = "[LessThanOrEqualTo_int32(GetDataModelSize(TraitArrays.GetTraits), '(int32)5')]"
 					flipdirection = yes
-					addcolumn = 52
+					addcolumn = 54
 					addrow = 55
 					maxhorizontalslots = 5
 					maxverticalslots = 1
@@ -2682,7 +2882,7 @@ types Lists
 					datamodel = "[TraitArrays.GetTraits]"
 					visible = "[And(GreaterThan_int32(GetDataModelSize(TraitArrays.GetTraits), '(int32)5'), LessThanOrEqualTo_int32(GetDataModelSize(TraitArrays.GetTraits), '(int32)7'))]"
 					flipdirection = yes
-					addcolumn = 37
+					addcolumn = 39
 					addrow = 40
 					maxhorizontalslots = 7
 					maxverticalslots = 1
@@ -2705,11 +2905,11 @@ types Lists
 				fixedgridbox = {
 					name = "traits_small"
 					datamodel = "[TraitArrays.GetTraits]"
-					visible = "[And(GreaterThan_int32(GetDataModelSize(TraitArrays.GetTraits), '(int32)7'), LessThanOrEqualTo_int32(GetDataModelSize(TraitArrays.GetTraits), '(int32)9'))]"
+					visible = "[And(GreaterThan_int32(GetDataModelSize(TraitArrays.GetTraits), '(int32)7'), LessThanOrEqualTo_int32(GetDataModelSize(TraitArrays.GetTraits), '(int32)10'))]"
 					flipdirection = yes
-					addcolumn = 29
+					addcolumn = 28
 					addrow = 29
-					maxhorizontalslots = 9
+					maxhorizontalslots = 10
 					maxverticalslots = 1
 
 					item = {
@@ -2730,7 +2930,7 @@ types Lists
 				fixedgridbox = {
 					name = "traits_tiny"
 					datamodel = "[TraitArrays.GetTraits]"
-					visible = "[GreaterThan_int32(GetDataModelSize(TraitArrays.GetTraits), '(int32)9')]"
+					visible = "[GreaterThan_int32(GetDataModelSize(TraitArrays.GetTraits), '(int32)10')]"
 					flipdirection = yes
 					addcolumn = 24
 					addrow = 25
@@ -2793,7 +2993,7 @@ types Lists
 					datamodel = "[TraitArrays.GetTraits]"
 					visible = "[LessThanOrEqualTo_int32(GetDataModelSize(TraitArrays.GetTraits), '(int32)4')]"
 					flipdirection = yes
-					addcolumn = 52
+					addcolumn = 54
 					addrow = 55
 					maxhorizontalslots = 5
 					maxverticalslots = 1
@@ -2813,7 +3013,7 @@ types Lists
 					datamodel = "[TraitArrays.GetTraits]"
 					visible = "[And(GreaterThan_int32(GetDataModelSize(TraitArrays.GetTraits), '(int32)4'), LessThanOrEqualTo_int32(GetDataModelSize(TraitArrays.GetTraits), '(int32)6'))]"
 					flipdirection = yes
-					addcolumn = 35
+					addcolumn = 39
 					addrow = 40
 					maxhorizontalslots = 7
 					maxverticalslots = 1
@@ -2822,7 +3022,7 @@ types Lists
 						icon_trait = {
 							blockoverride "icon_size"
 							{
-								size = { 38 38 }
+								size = { 40 40 }
 							}
 
 							blockoverride "glow_radius"
@@ -2838,9 +3038,9 @@ types Lists
 					datamodel = "[TraitArrays.GetTraits]"
 					visible = "[And(GreaterThan_int32(GetDataModelSize(TraitArrays.GetTraits), '(int32)6'), LessThanOrEqualTo_int32(GetDataModelSize(TraitArrays.GetTraits), '(int32)8'))]"
 					flipdirection = yes
-					addcolumn = 26
+					addcolumn = 28
 					addrow = 29
-					maxhorizontalslots = 8
+					maxhorizontalslots = 10
 					maxverticalslots = 1
 
 					item = {
@@ -2863,10 +3063,10 @@ types Lists
 					datamodel = "[TraitArrays.GetTraits]"
 					visible = "[GreaterThan_int32(GetDataModelSize(TraitArrays.GetTraits), '(int32)8')]"
 					flipdirection = yes
-					addcolumn = 25
+					addcolumn = 24
 					addrow = 25
-					maxhorizontalslots = 8
+					maxhorizontalslots = 9
-					datamodel_wrap = 8
+					datamodel_wrap = 9
 					maxverticalslots = 2
 
 					item = {
@@ -3280,7 +3480,6 @@ template Scrollbar_Vertical
 				spriteborder = { 0 3 }
 				framesize = { 12 40 }
 				minimumsize = { -1 40 }
-				block "vertical_scrollbar_size" {}
 
 				upframe = 1
 				overframe = 2

gui/texticons.gui

@@ -2427,16 +2427,6 @@ texticon = {
 	}
 }
 
-texticon = {
-	icon = commander_advantage_icon
-	iconsize = {
-		texture = "gfx/interface/icons/icon_commander_advantage.dds"
-		size = { 25 25 }
-		offset = { 0 6 }
-		fontsize = 16
-	}
-}
-
 texticon = {
 	icon = alliance_icon
 	iconsize = {
@@ -3116,16 +3106,6 @@ texticon = {
 	}
 }
 
-texticon = {
-	icon = time_icon
-	iconsize = {
-		texture = "gfx/interface/icons/icon_time.dds"
-		size = { 24 24 }
-		offset = { 0 6 }
-		fontsize = 16
-	}
-}
-
 texticon = {
 	icon = concubine_icon
 	iconsize = {
@@ -4029,56 +4009,6 @@ texticon = {
 	}
 }
 
-texticon = {
-	icon = north_pacific_attire
-	iconsize = {
-		texture = "gfx/interface/icons/dlc/dlc_025.dds"
-		size = { 25 25 }
-		offset = { 0 6 }
-		fontsize = 16
-	}
-}
-
-texticon = {
-	icon = east_asian_wonders
-	iconsize = {
-		texture = "gfx/interface/icons/dlc/dlc_026.dds"
-		size = { 25 25 }
-		offset = { 0 6 }
-		fontsize = 16
-	}
-}
-
-texticon = {
-	icon = celestial_court_attire
-	iconsize = {
-		texture = "gfx/interface/icons/dlc/dlc_027.dds"
-		size = { 25 25 }
-		offset = { 0 6 }
-		fontsize = 16
-	}
-}
-
-texticon = {
-	icon = symbols_of_authority
-	iconsize = {
-		texture = "gfx/interface/icons/dlc/dlc_028.dds"
-		size = { 25 25 }
-		offset = { 0 6 }
-		fontsize = 16
-	}
-}
-
-texticon = {
-	icon = songs_of_the_realm
-	iconsize = {
-		texture = "gfx/interface/icons/dlc/dlc_029.dds"
-		size = { 25 25 }
-		offset = { 0 6 }
-		fontsize = 16
-	}
-}
-
 texticon = {
 	icon = skills_icon
 	iconsize = {