From 7dc51566e2873902b7599869bfc3d44097259194 Mon Sep 17 00:00:00 2001
From: Edmund <447ght@gmail.com>
Date: Sun, 17 Dec 2023 22:56:07 -0500
Subject: [PATCH 1/3] naive implementation

---
 .../decisions/dlc_decisions/fp3_decisions.txt | 60 +++++++++++++++----
 1 file changed, 50 insertions(+), 10 deletions(-)

diff --git a/common/decisions/dlc_decisions/fp3_decisions.txt b/common/decisions/dlc_decisions/fp3_decisions.txt
index dd765a7703..18bc3e8f81 100644
--- a/common/decisions/dlc_decisions/fp3_decisions.txt
+++ b/common/decisions/dlc_decisions/fp3_decisions.txt
@@ -298,18 +298,37 @@ fp3_become_clan_government_decision = {
 
 	cost = { prestige = major_prestige_value }
 
+	major = yes
+	sort_order = 3
+
 	is_shown = {
 		has_fp3_dlc_trigger = yes
 		# You are Feudal
 		#government_has_flag = government_is_feudal
 		NOT = { government_has_flag = government_is_clan }
-		# Has a House and is not House Head
-		exists = house
-		NOT = { house.house_head = root }
-		# Religion is Islam (Clan)
 		#like_islam_religion_trigger = yes
-		# House head is Clan
-		house.house_head = { government_has_flag = government_is_clan }
+		OR = { 
+			AND = { 
+				# Has a House and is not House Head
+				exists = house
+				NOT = { house.house_head = root }
+				# Religion is Islam (Clan)
+				# House head is Clan
+				house.house_head = { government_has_flag = government_is_clan }
+			}
+			AND = { 
+				# Has a House and is not House Head 
+				exists = house
+				house.house_head = root
+				OR = { 
+					culture = { has_cultural_pillar = heritage_orcish }
+					culture = { has_cultural_pillar = heritage_tauren }
+					culture = { has_cultural_pillar = heritage_gorian }
+					culture = { has_cultural_pillar = heritage_agamagganic }
+					culture = { has_cultural_pillar = heritage_zaetaric }
+				}
+			}
+		}
 	}
 
 	is_valid = {
@@ -318,10 +337,31 @@ fp3_become_clan_government_decision = {
 		NOT = { government_has_flag = government_is_clan }
 		# Religion is Islam (Clan)
 		#like_islam_religion_trigger = yes
-		# House head is Clan
-		custom_tooltip = {
-			text = fp3_become_clan_government_decision_house_head_tt
-			house.house_head = { government_has_flag = government_is_clan }
+		OR = { 
+			AND = { 
+				# Has a House and is not House Head
+				exists = house
+				NOT = { house.house_head = root }
+				# Religion is Islam (Clan)
+				# House head is Clan
+				house.house_head = { government_has_flag = government_is_clan }
+				custom_tooltip = {
+				text = fp3_become_clan_government_decision_house_head_tt
+				house.house_head = { government_has_flag = government_is_clan }
+		}
+			}
+			AND = { 
+				# Has a House and is not House Head
+				exists = house
+				house.house_head = root
+				OR = { 
+					culture = { has_cultural_pillar = heritage_orcish }
+					culture = { has_cultural_pillar = heritage_tauren }
+					culture = { has_cultural_pillar = heritage_gorian }
+					culture = { has_cultural_pillar = heritage_agamagganic }
+					culture = { has_cultural_pillar = heritage_zaetaric }
+				}
+			}
 		}
 	}
 

From cebd9c859f5de08439f8c237296dc616c5c7b928 Mon Sep 17 00:00:00 2001
From: Edmund <447ght@gmail.com>
Date: Wed, 20 Dec 2023 13:03:38 -0500
Subject: [PATCH 2/3] Revert "naive implementation"

This reverts commit 7dc51566e2873902b7599869bfc3d44097259194.
---
 .../decisions/dlc_decisions/fp3_decisions.txt | 60 ++++---------------
 1 file changed, 10 insertions(+), 50 deletions(-)

diff --git a/common/decisions/dlc_decisions/fp3_decisions.txt b/common/decisions/dlc_decisions/fp3_decisions.txt
index 18bc3e8f81..dd765a7703 100644
--- a/common/decisions/dlc_decisions/fp3_decisions.txt
+++ b/common/decisions/dlc_decisions/fp3_decisions.txt
@@ -298,37 +298,18 @@ fp3_become_clan_government_decision = {
 
 	cost = { prestige = major_prestige_value }
 
-	major = yes
-	sort_order = 3
-
 	is_shown = {
 		has_fp3_dlc_trigger = yes
 		# You are Feudal
 		#government_has_flag = government_is_feudal
 		NOT = { government_has_flag = government_is_clan }
+		# Has a House and is not House Head
+		exists = house
+		NOT = { house.house_head = root }
+		# Religion is Islam (Clan)
 		#like_islam_religion_trigger = yes
-		OR = { 
-			AND = { 
-				# Has a House and is not House Head
-				exists = house
-				NOT = { house.house_head = root }
-				# Religion is Islam (Clan)
-				# House head is Clan
-				house.house_head = { government_has_flag = government_is_clan }
-			}
-			AND = { 
-				# Has a House and is not House Head 
-				exists = house
-				house.house_head = root
-				OR = { 
-					culture = { has_cultural_pillar = heritage_orcish }
-					culture = { has_cultural_pillar = heritage_tauren }
-					culture = { has_cultural_pillar = heritage_gorian }
-					culture = { has_cultural_pillar = heritage_agamagganic }
-					culture = { has_cultural_pillar = heritage_zaetaric }
-				}
-			}
-		}
+		# House head is Clan
+		house.house_head = { government_has_flag = government_is_clan }
 	}
 
 	is_valid = {
@@ -337,31 +318,10 @@ fp3_become_clan_government_decision = {
 		NOT = { government_has_flag = government_is_clan }
 		# Religion is Islam (Clan)
 		#like_islam_religion_trigger = yes
-		OR = { 
-			AND = { 
-				# Has a House and is not House Head
-				exists = house
-				NOT = { house.house_head = root }
-				# Religion is Islam (Clan)
-				# House head is Clan
-				house.house_head = { government_has_flag = government_is_clan }
-				custom_tooltip = {
-				text = fp3_become_clan_government_decision_house_head_tt
-				house.house_head = { government_has_flag = government_is_clan }
-		}
-			}
-			AND = { 
-				# Has a House and is not House Head
-				exists = house
-				house.house_head = root
-				OR = { 
-					culture = { has_cultural_pillar = heritage_orcish }
-					culture = { has_cultural_pillar = heritage_tauren }
-					culture = { has_cultural_pillar = heritage_gorian }
-					culture = { has_cultural_pillar = heritage_agamagganic }
-					culture = { has_cultural_pillar = heritage_zaetaric }
-				}
-			}
+		# House head is Clan
+		custom_tooltip = {
+			text = fp3_become_clan_government_decision_house_head_tt
+			house.house_head = { government_has_flag = government_is_clan }
 		}
 	}
 

From 96cdbdfb977fb5e02d2a2268afc3544900c48126 Mon Sep 17 00:00:00 2001
From: Edmund <447ght@gmail.com>
Date: Wed, 20 Dec 2023 13:10:58 -0500
Subject: [PATCH 3/3] better solution that doesnt break something

---
 common/scripted_triggers/wc_government_triggers.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/common/scripted_triggers/wc_government_triggers.txt b/common/scripted_triggers/wc_government_triggers.txt
index cc2d5a42ae..b52090bee8 100644
--- a/common/scripted_triggers/wc_government_triggers.txt
+++ b/common/scripted_triggers/wc_government_triggers.txt
@@ -79,6 +79,9 @@ can_keep_clan_government_trigger = {
 	OR = {
 		culture = { has_cultural_pillar = heritage_orcish }
 		culture = { has_cultural_pillar = heritage_tauren }
+		culture = { has_cultural_pillar = heritage_gorian }
+		culture = { has_cultural_pillar = heritage_agamagganic }
+		culture = { has_cultural_pillar = heritage_zaetaric }
 		culture = culture:wildhammer
 		culture = {
 			AND = {