From 5fbbd21310cdb91d26c7de07a060446d638f2e86 Mon Sep 17 00:00:00 2001
From: Fishedotjpg <Fishe.jpg@gmail.com>
Date: Mon, 9 Mar 2026 20:02:09 +0000
Subject: [PATCH] fixes for clothes

---
 common/on_action/title_on_actions.txt         |    9 +-
 common/on_action/yearly_on_actions.txt        |    4 -
 .../00_clothing_triggers.txt                  |    2 +-
 .../portrait_modifiers/00_custom_headgear.txt | 1493 +++++++++++++++++
 .../05_clothes_situational.txt                |   10 +-
 5 files changed, 1497 insertions(+), 21 deletions(-)
 create mode 100644 gfx/portraits/portrait_modifiers/00_custom_headgear.txt

diff --git a/common/on_action/title_on_actions.txt b/common/on_action/title_on_actions.txt
index 0b2c9f6d..9b110f4d 100644
--- a/common/on_action/title_on_actions.txt
+++ b/common/on_action/title_on_actions.txt
@@ -209,7 +209,6 @@ on_title_gain = {
 					}
 				}
 			}
-			add_character_flag = peasant_outfit
 			create_noble_family_effect = { GOVERNMENT_GIVER = this }
 		}
 		if = {
@@ -221,7 +220,6 @@ on_title_gain = {
 					}
 				}
 			}
-			add_character_flag = peasant_outfit
 			primary_title = {
 				add_title_law = saxon_elective_succession_law
 			}
@@ -2503,8 +2501,7 @@ on_title_gain = {
 		if = {
 			limit = {
 				has_character_flag = peasant_outfit
-				NOT = { government_has_flag = government_is_herder }
-				NOT = { government_has_flag = government_is_prepublic }
+				NOT = { government_has_flag = government_is_true_herder }
 			}
 			remove_character_flag = peasant_outfit
 		}
@@ -2837,7 +2834,6 @@ on_title_gain_inheritance = {
 					}
 				}
 			}
-			add_character_flag = peasant_outfit
 			create_noble_family_effect = { GOVERNMENT_GIVER = this }
 		}
 		if = {
@@ -2849,7 +2845,6 @@ on_title_gain_inheritance = {
 					}
 				}
 			}
-			add_character_flag = peasant_outfit
 			primary_title = {
 				add_title_law = saxon_elective_succession_law
 			}
@@ -2916,7 +2911,6 @@ on_title_gain_usurpation = {
 					}
 				}
 			}
-			add_character_flag = peasant_outfit
 			create_noble_family_effect = { GOVERNMENT_GIVER = this }
 		}
 		if = {
@@ -2928,7 +2922,6 @@ on_title_gain_usurpation = {
 					}
 				}
 			}
-			add_character_flag = peasant_outfit
 			primary_title = {
 				add_title_law = saxon_elective_succession_law
 			}
diff --git a/common/on_action/yearly_on_actions.txt b/common/on_action/yearly_on_actions.txt
index 65fcf2b9..93e8bcd9 100644
--- a/common/on_action/yearly_on_actions.txt
+++ b/common/on_action/yearly_on_actions.txt
@@ -767,7 +767,6 @@ yearly_playable_pulse = {
 					}
 				}
 			}
-			add_character_flag = peasant_outfit
 			create_noble_family_effect = { GOVERNMENT_GIVER = this }
 		}
 		if = {
@@ -779,7 +778,6 @@ yearly_playable_pulse = {
 					}
 				}
 			}
-			add_character_flag = peasant_outfit
 			primary_title = {
 				add_title_law = saxon_elective_succession_law
 			}
@@ -2709,7 +2707,6 @@ quarterly_playable_pulse = {
 					}
 				}
 			}
-			add_character_flag = peasant_outfit
 			create_noble_family_effect = { GOVERNMENT_GIVER = this }
 		}
 		if = {
@@ -2721,7 +2718,6 @@ quarterly_playable_pulse = {
 					}
 				}
 			}
-			add_character_flag = peasant_outfit
 			primary_title = {
 				add_title_law = saxon_elective_succession_law
 			}
diff --git a/common/scripted_triggers/00_clothing_triggers.txt b/common/scripted_triggers/00_clothing_triggers.txt
index 7f461215..17de25b0 100644
--- a/common/scripted_triggers/00_clothing_triggers.txt
+++ b/common/scripted_triggers/00_clothing_triggers.txt
@@ -479,7 +479,7 @@ portrait_wear_no_crown_trigger = { # Rulers should be coronated to wear a crown
 				NOT = { coronation_proper_artifact_regalia_trigger = yes }
 			}
 		}
-
+		government_has_flag = government_is_prepublic
 		has_character_flag = sold_crown_charmod # No crowns for characters who sold theirs
 
 		has_character_modifier = vow_of_poverty_modifier # Or for characters with an active Vow of Poverty
diff --git a/gfx/portraits/portrait_modifiers/00_custom_headgear.txt b/gfx/portraits/portrait_modifiers/00_custom_headgear.txt
new file mode 100644
index 00000000..5197b9b7
--- /dev/null
+++ b/gfx/portraits/portrait_modifiers/00_custom_headgear.txt
@@ -0,0 +1,1493 @@
+custom_headgear = {
+	usage = customization
+	interface_position = 4
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = no_headgear
+	}
+
+	## TGP Chinese ##
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = tgp_chinese_imperial
+		is_valid_custom = {
+			has_tgp_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = tgp_chinese_era2_imperial
+		is_valid_custom = {
+			has_tgp_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = tgp_chinese_era1_war_nobility
+		is_valid_custom = {
+			has_tgp_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = tgp_chinese_era2_war_nobility
+		is_valid_custom = {
+			has_tgp_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = tgp_chinese_era1_nobility
+		is_valid_custom = {
+			has_tgp_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = tgp_chinese_era2_nobility
+		is_valid_custom = {
+			has_tgp_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = tgp_chinese_high_nobility
+		is_valid_custom = {
+			has_tgp_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = tgp_chinese_commoner
+		is_valid_custom = {
+			has_tgp_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = tgp_chinese_royalty
+		is_valid_custom = {
+			has_tgp_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = tgp_japanese_imperial
+		is_valid_custom = {
+			has_tgp_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = tgp_japanese_royalty
+		is_valid_custom = {
+			has_tgp_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = tgp_japanese_nobility
+		is_valid_custom = {
+			has_tgp_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = tgp_japanese_war_nobility
+		is_valid_custom = {
+			has_tgp_dlc_trigger = yes
+		}
+	}
+
+		add_accessory_modifiers = {
+		gene = headgear
+		template = tgp_japanese_war_high_nobility
+		is_valid_custom = {
+			has_tgp_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = tgp_japanese_high_nobility
+		is_valid_custom = {
+			has_tgp_dlc_trigger = yes
+		}
+	}
+
+	# add_accessory_modifiers = {
+	# 	gene = headgear
+	# 	template = tgp_shinto_priest
+	# 	is_valid_custom = {
+	# 		has_tgp_dlc_trigger = yes
+	# 	}
+	# }
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = tgp_japanese_commoner
+		is_valid_custom = {
+			has_tgp_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = tgp_japanese_shogun
+		is_valid_custom = {
+			has_tgp_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = tgp_southeast_nobility
+		is_valid_custom = {
+			has_tgp_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = tgp_southeast_royal
+		is_valid_custom = {
+			has_tgp_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = tgp_korean_imperial
+		is_valid_custom = {
+			has_tgp_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = tgp_korean_nobility
+		is_valid_custom = {
+			has_tgp_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = tgp_korean_commoner
+		is_valid_custom = {
+			has_tgp_dlc_trigger = yes
+		}
+	}
+
+	### MPO - Khans of the Steppe ###
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = mpo_mongol_commoner
+		is_valid_custom = {
+			has_mpo_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = mpo_mongol_nobility
+		is_valid_custom = {
+			has_mpo_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = mpo_mongol_royalty
+		is_valid_custom = {
+			has_mpo_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = mpo_mongol_imperial
+		is_valid_custom = {
+			has_mpo_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = mpo_mongol_war_nobility
+		is_valid_custom = {
+			has_mpo_dlc_trigger = yes
+		}
+	}
+	
+	## SP4 - Crowns of the World ##
+	
+	add_accessory_modifiers = {
+		gene = headgear
+		template = sp4_mena_royalty
+		is_valid_custom = {
+			has_sp4_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = sp4_rus_royalty
+		is_valid_custom = {
+			has_sp4_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = sp4_western_royalty
+		is_valid_custom = {
+			has_sp4_dlc_trigger = yes
+		}
+	}
+
+	## CCP4 Sami ##
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ccp4_sami_common
+		is_valid_custom = {
+			has_cp4_dlc_trigger = yes
+		}	
+	}	
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ccp4_sami_low_nobility
+		is_valid_custom = {
+			has_cp4_dlc_trigger = yes
+		}	
+	}	
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ccp4_sami_high_nobility
+		is_valid_custom = {
+			has_cp4_dlc_trigger = yes
+		}	
+	}	
+
+	## CCP4 Khanty ##
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ccp4_khanty_common
+		is_valid_custom = {
+			has_cp4_dlc_trigger = yes
+		}	
+	}	
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ccp4_khanty_low_nobility
+		is_valid_custom = {
+			has_cp4_dlc_trigger = yes
+		}	
+	}	
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ccp4_khanty_high_nobility
+		is_valid_custom = {
+			has_cp4_dlc_trigger = yes
+		}	
+	}	
+	
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ccp4_khanty_war
+		is_valid_custom = {
+			has_cp4_dlc_trigger = yes
+		}	
+	}	
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ccp4_religious_siberian_commoner
+		is_valid_custom = {
+			has_cp4_dlc_trigger = yes
+		}	
+	}
+
+		##CCP5
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ccp5_english_era3_war_nobility
+		is_valid_custom = {
+			has_cp5_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ccp5_german_era3_war_nobility
+		is_valid_custom = {
+			has_cp5_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ccp5_french_era3_war_nobility
+		is_valid_custom = {
+			has_cp5_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ccp5_french_era3_war_com
+		is_valid_custom = {
+			has_cp5_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ccp5_english_era4_war_nobility
+		is_valid_custom = {
+			has_cp5_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ccp5_german_era4_war_nobility
+		is_valid_custom = {
+			has_cp5_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ccp5_french_era4_war_nobility
+		is_valid_custom = {
+			has_cp5_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ccp5_swabian_era4_war_nobility
+		is_valid_custom = {
+			has_cp5_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ccp5_western_war_nobility
+		is_valid_custom = {
+			has_cp5_dlc_trigger = yes
+		}
+	}
+	
+	## POL ##
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = pol_common
+		is_valid_custom = {
+			has_pol_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = pol_low_nobility
+		is_valid_custom = {
+			has_pol_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = pol_high_nobility
+		is_valid_custom = {
+			has_pol_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = pol_royalty
+		is_valid_custom = {
+			has_pol_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = pol_imperial
+		is_valid_custom = {
+			has_pol_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = pol_war
+		is_valid_custom = {
+			has_pol_dlc_trigger = yes
+		}
+	}
+
+	## Veils ##
+	add_accessory_modifiers = {
+		gene = headgear
+		template = fp4_western_era2_veils
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = western_veils
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ep2_western_era1_veils
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ep2_western_era2_veils
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ep2_western_era3_veils
+	}
+
+
+	## EP3 ##
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ep3_byzantine_era1_commoner
+		is_valid_custom = {
+			has_ep3_dlc_trigger = yes
+		}
+	}
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ep3_byzantine_era1_low_nobility
+		is_valid_custom = {
+			has_ep3_dlc_trigger = yes
+		}
+	}
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ep3_byzantine_era1_high_nobility
+		is_valid_custom = {
+			has_ep3_dlc_trigger = yes
+		}
+	}
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ep3_byzantine_era1_royalty
+		is_valid_custom = {
+			has_ep3_dlc_trigger = yes
+		}
+	}
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ep3_byzantine_era1_imperial
+		is_valid_custom = {
+			has_ep3_dlc_trigger = yes
+		}
+	}
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ep3_byzantine_era1_war_nobility
+		is_valid_custom = {
+			has_ep3_dlc_trigger = yes
+		}
+	}
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ep3_byzantine_era2_low_nobility
+		is_valid_custom = {
+			has_ep3_dlc_trigger = yes
+		}
+	}
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ep3_byzantine_era2_high_nobility
+		is_valid_custom = {
+			has_ep3_dlc_trigger = yes
+		}
+	}
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ep3_byzantine_era2_royalty
+		is_valid_custom = {
+			has_ep3_dlc_trigger = yes
+		}
+	}
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ep3_byzantine_era2_imperial
+		is_valid_custom = {
+			has_ep3_dlc_trigger = yes
+		}
+	}
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ep3_byzantine_era2_war_nobility
+		is_valid_custom = {
+			has_ep3_dlc_trigger = yes
+		}
+	}
+
+
+	## CE1 ##
+	add_accessory_modifiers = {
+		gene = headgear
+		template = fp4_western_common
+		is_valid_custom = {
+			has_ce1_dlc_trigger = yes
+		}
+	}
+	add_accessory_modifiers = {
+		gene = headgear
+		template = fp4_western_era3_common
+	}
+	add_accessory_modifiers = {
+		gene = headgear
+		template = fp4_western_cloak_hoods
+		is_valid_custom = {
+			has_ce1_dlc_trigger = yes
+		}
+	}
+	add_accessory_modifiers = {
+		gene = headgear
+		template = fp4_western_low_nobility
+		is_valid_custom = {
+			has_ce1_dlc_trigger = yes
+		}
+	}
+	add_accessory_modifiers = {
+		gene = headgear
+		template = fp4_western_royalty
+		is_valid_custom = {
+			has_ce1_dlc_trigger = yes
+		}
+	}
+
+	## Couture of the Capets ##
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = sp3_western_royalty
+		is_valid_custom = {
+			has_dlc_feature = couture_of_the_capets
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = sp3_western_high_nobility
+		is_valid_custom = {
+			has_dlc_feature = couture_of_the_capets
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = sp3_western_nobility
+		is_valid_custom = {
+			has_dlc_feature = couture_of_the_capets
+		}
+	}
+
+	## AFR ##
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = afr_common
+		is_valid_custom = {
+			has_afr_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = afr_low_nobility
+		is_valid_custom = {
+			has_afr_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = afr_high_nobility
+		is_valid_custom = {
+			has_afr_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = afr_royalty
+		is_valid_custom = {
+			has_afr_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = afr_imperial
+		is_valid_custom = {
+			has_afr_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = afr_war
+		is_valid_custom = {
+			has_afr_dlc_trigger = yes
+		}
+	}
+
+	### FP3 ###
+	### Iranian ###
+	add_accessory_modifiers = {
+		gene = headgear
+		template = fp3_iranian_imperial
+		is_valid_custom = {
+			OR = {
+				has_fp3_dlc_trigger = yes
+				has_mpo_dlc_trigger = yes
+			}
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = fp3_iranian_royalty
+		is_valid_custom = {
+			OR = {
+				has_fp3_dlc_trigger = yes
+				has_mpo_dlc_trigger = yes
+			}
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = fp3_iranian_low_nobility
+		is_valid_custom = {
+			has_fp3_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = fp3_iranian_nobility
+		is_valid_custom = {
+			has_fp3_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = fp3_iranian_war
+		is_valid_custom = {
+			has_fp3_dlc_trigger = yes
+		}
+	}
+
+	### Turkic ###
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = fp3_turkic_low_nobility
+		is_valid_custom = {
+			OR = {
+				has_fp3_dlc_trigger = yes
+				has_mpo_dlc_trigger = yes
+			}
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = fp3_turkic_nobility
+		is_valid_custom = {
+			OR = {
+				has_fp3_dlc_trigger = yes
+				has_mpo_dlc_trigger = yes
+			}
+		}
+	}
+
+	## SP1 ##
+	add_accessory_modifiers = {
+		gene = headgear
+		template = reward_western_royalty
+		is_valid_custom = {
+			has_reward_item = newsletter_crown
+		}
+	}
+
+	## SP2 Elegance of the Empire ##
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = sp2_western_imperial
+		is_valid_custom = {
+			has_dlc_feature = elegance_of_the_empire
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = sp2_western_high_nobility
+		is_valid_custom = {
+			has_dlc_feature = elegance_of_the_empire
+		}
+	}
+
+
+
+	### EP2 ###
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = western_wedding
+		is_valid_custom = {
+			has_ep2_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = mena_wedding
+		is_valid_custom = {
+			has_ep2_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = byzantine_wedding
+		is_valid_custom = {
+			has_ep2_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ep2_western_era1_imperial
+		is_valid_custom = {
+			has_ep2_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ep2_western_era1_royalty
+		is_valid_custom = {
+			has_ep2_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ep2_western_era1_high_nobility
+		is_valid_custom = {
+			has_ep2_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ep2_western_era1_nobility
+		is_valid_custom = {
+			has_ep2_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ep2_western_era1_common
+		is_valid_custom = {
+			has_ep2_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ep2_western_era1_war_nobility
+		is_valid_custom = {
+			has_ep2_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ep2_western_era2_war_nobility
+		is_valid_custom = {
+			has_ep2_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ep2_western_era3_war_nobility
+		is_valid_custom = {
+			has_ep2_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ep2_western_era4_war_nobility
+		is_valid_custom = {
+			has_ep2_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ep2_mena_war_nobility
+		is_valid_custom = {
+			has_ep2_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ep2_steppe_war_nobility
+		is_valid_custom = {
+			has_ep2_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ep2_byzantine_war_nobility
+		is_valid_custom = {
+			has_ep2_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ep2_indian_war_nobility
+		is_valid_custom = {
+			has_ep2_dlc_trigger = yes
+		}
+	}
+
+	### FP2 ###
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = fp2_christian_common
+		is_valid_custom = {
+			has_fp2_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = fp2_christian_low_nobility
+		is_valid_custom = {
+			has_fp2_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = fp2_christian_high_nobility
+		is_valid_custom = {
+			has_fp2_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = fp2_christian_royalty
+		is_valid_custom = {
+			has_fp2_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = fp2_christian_war_nobility
+		is_valid_custom = {
+			has_fp2_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = fp2_muslim_common
+		is_valid_custom = {
+			has_fp2_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = fp2_muslim_low_nobility
+		is_valid_custom = {
+			has_fp2_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = fp2_muslim_high_nobility
+		is_valid_custom = {
+			has_fp2_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = fp2_muslim_royalty
+		is_valid_custom = {
+			has_fp2_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = fp2_muslim_war_nobility
+		is_valid_custom = {
+			has_fp2_dlc_trigger = yes
+		}
+	}
+
+	### EP1 ###
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ep1_western_royalty
+		is_valid_custom = {
+			has_ep1_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ep1_mena_royalty
+		is_valid_custom = {
+			has_ep1_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ep1_steppe_royalty
+		is_valid_custom = {
+			OR = {
+				has_ep1_dlc_trigger = yes
+				has_mpo_dlc_trigger = yes
+			}
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ep1_sub_saharan_royalty
+		is_valid_custom = {
+			has_ep1_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ep1_indian_royalty
+		is_valid_custom = {
+			has_ep1_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ep1_indian_imperial
+		is_valid_custom = {
+			has_ep1_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ep1_byzantine_imperial
+		is_valid_custom = {
+			has_ep1_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ep1_italian_royalty
+		is_valid_custom = {
+			has_ep1_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ep1_persian_imperial
+		is_valid_custom = {
+			has_ep1_dlc_trigger = yes
+		}
+	}
+
+	### FP1 ###
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = fp1_common
+		is_valid_custom = {
+			has_fp1_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = fp1_low_nobility
+		is_valid_custom = {
+			has_fp1_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = fp1_nobility
+		is_valid_custom = {
+			has_fp1_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = fp1_war
+		is_valid_custom = {
+			has_fp1_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = fp1_royalty
+		is_valid_custom = {
+			has_fp1_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = fp1_imperial
+		is_valid_custom = {
+			has_fp1_dlc_trigger = yes
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = western_common
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = western_nobility
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		# is_valid_custom = {
+		# 	highest_held_title_tier >= tier_duchy
+		# }
+		template = western_high_nobility
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		# is_valid_custom = {
+		# 	highest_held_title_tier >= tier_kingdom
+		# }
+		template = western_royalty
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		# is_valid_custom = {
+		# 	highest_held_title_tier >= tier_kingdom
+		# }
+		template = western_imperial
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = western_war
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = crusades_western_war
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = northern_common
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = northern_war
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = byzantine_common
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = byzantine_nobility
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = byzantine_high_nobility
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = byzantine_royalty
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = byzantine_imperial
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = byzantine_war
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = mena_common
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = mena_low_nobility
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = mena_high_nobility
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = mena_royalty
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = mena_imperial
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = mena_war
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = steppe_common
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = steppe_nobility
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = steppe_high_nobility
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = steppe_royalty
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = steppe_war
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = sub_saharan_common
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = sub_saharan_high_nobility
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = sub_saharan_royalty
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = sub_saharan_imperial
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = indian_common
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = indian_nobility
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = indian_high_nobility
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = indian_royalty
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = indian_imperial
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = indian_war
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = dde_hre_common
+		is_valid_custom = {
+			has_dlc = "Garments of the Holy Roman Empire"
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = dde_hre_nobility
+		is_valid_custom = {
+			has_dlc = "Garments of the Holy Roman Empire"
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = dde_hre_high_nobility
+		is_valid_custom = {
+			has_dlc = "Garments of the Holy Roman Empire"
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = dde_hre_royalty
+		is_valid_custom = {
+			has_dlc = "Garments of the Holy Roman Empire"
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = dde_hre_imperial
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = dde_hre_war
+		is_valid_custom = {
+			has_dlc = "Garments of the Holy Roman Empire"
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = dde_abbasid_common
+		is_valid_custom = {
+			has_dlc = "Fashion of the Abbasid Court"
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = dde_abbasid_high_nobility
+		is_valid_custom = {
+			has_dlc = "Fashion of the Abbasid Court"
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = dde_abbasid_royalty
+		is_valid_custom = {
+			has_dlc = "Fashion of the Abbasid Court"
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = dde_abbasid_imperial
+		is_valid_custom = {
+			has_dlc = "Fashion of the Abbasid Court"
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = dde_abbasid_war
+		is_valid_custom = {
+			has_dlc = "Fashion of the Abbasid Court"
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = religious_catholic_devoted
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = catholic_high
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = catholic_head
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = religious_orthodox_high
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = religious_orthodox_head
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = religious_zoroastrian_high
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = religious_jewish_high
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = religious_jewish_head
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = religious_muslim_high
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = religious_muslim_head
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = religious_african_high
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = religious_steppe_high
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = religious_northern_high
+	}
+
+	#add_accessory_modifiers = {
+	#	gene = hairstyles
+	#	template = rtt_hairstyles
+	#
+	#	is_valid_custom = {
+	#		monarchs_journey_unlock = 1
+	#	}
+	#}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = monarchs_journey_low
+
+		weight = {
+			base = 0
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = monarchs_journey_high
+
+		weight = {
+			base = 0
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = headgear
+		template = ep1_jester
+
+		weight = {
+			base = 0
+		}
+	}
+
+	add_accessory_modifiers = {
+		gene = special_headgear_spectacles
+		template = spectacles
+	}
+
+}
diff --git a/gfx/portraits/portrait_modifiers/05_clothes_situational.txt b/gfx/portraits/portrait_modifiers/05_clothes_situational.txt
index e4afd6db..96eaf6c0 100644
--- a/gfx/portraits/portrait_modifiers/05_clothes_situational.txt
+++ b/gfx/portraits/portrait_modifiers/05_clothes_situational.txt
@@ -78,10 +78,7 @@
 			base = 0
 			modifier = {
 				add = 500
-				OR = {
-					has_character_flag = peasant_outfit
-					government_has_flag = government_is_prepublic
-				}
+				has_character_flag = peasant_outfit
 				NOR = {
 					portrait_mena_clothing_trigger = yes
 					portrait_indian_clothing_trigger = yes
@@ -147,10 +144,7 @@
 			base = 0
 			modifier = {
 				add = 500
-				OR = {
-					has_character_flag = peasant_outfit
-					government_has_flag = government_is_prepublic
-				}
+				has_character_flag = peasant_outfit
 				OR = {
 					portrait_mena_clothing_trigger = yes
 					portrait_indian_clothing_trigger = yes