3.3 compatch

IhateTrains · Oct 20, 2019 · cf9ec6d · cf9ec6d
1 parent 84ace5b
commit cf9ec6d
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 5 deletions.
diff --git a/ChristianSchisms/decisions/conversion_decisions.txt b/ChristianSchisms/decisions/conversion_decisions.txt
@@ -19,6 +19,7 @@ targetted_decisions = {
 		allow = {
 			NOT = { trait = zealous }
 			liege = { ROOTs_religion_is_playable_trigger = yes }
+			holy_order = no
 		}
 		effect = {
 			prestige = -500
@@ -658,6 +659,7 @@ targetted_decisions = {
 		}
 		allow = {
 			NOT = { trait = zealous }
+			holy_order = no
 		}
 		effect = {
 			prestige = -500
@@ -1161,6 +1163,7 @@ targetted_decisions = {
 		allow = {
 			NOT = { trait = zealous }
 			piety = 50
+			holy_order = no
 		}
 		effect = {
 			piety = -50
@@ -1345,6 +1348,7 @@ targetted_decisions = {
 				text = indian_has_not_converted
 				NOT = { has_character_flag = india_converted }
 			}
+			holy_order = no
 		}
 		effect = {
 			if = {
@@ -1452,6 +1456,7 @@ targetted_decisions = {
 		}
 		allow = {
 			is_adult = yes
+			holy_order = no
 			prestige = 500
 			NOT = { trait = zealous }
 			any_realm_province = {
@@ -2756,6 +2761,7 @@ targetted_decisions = {
 				}		
 
 				religion = ROOT
+				abdicate_holy_order_if_religion_changes_effect = yes
 
 				#When spouse is Hindu
 				if = {
@@ -2938,6 +2944,7 @@ decisions = {
 		effect = {
 			prestige = -500
 			piety = 100
+			abdicate_holy_order_if_religion_changes_effect = yes
 
 			hidden_tooltip = {
 				any_war = {

diff --git a/ChristianSchisms/events/HFP_crusade_events.txt b/ChristianSchisms/events/HFP_crusade_events.txt
@@ -401,6 +401,7 @@ character_event = {
     		}
     		narrative_event = { id = HFP.41004 }
     	}
+        abdicate_holy_order_if_religion_changes_effect = yes
     }
 }
 
@@ -5440,6 +5441,7 @@ character_event = {
                 set_crusade_pot_multiplier = 0
             }
         }
+        abdicate_holy_order_if_religion_changes_effect = yes
     }
 }
 
@@ -5461,6 +5463,7 @@ character_event = {
         religion_head = {
             character_event = { id = HFP.41086 days = 1 }
         }
+        abdicate_holy_order_if_religion_changes_effect = yes
     }
 }
 

diff --git a/ChristianSchisms/events/on_action_events.txt b/ChristianSchisms/events/on_action_events.txt
@@ -620,6 +620,11 @@ character_event = {
 	border = GFX_event_normal_frame_war
 
 	is_triggered_only = yes 
+
+	immediate = {
+		#Clean-up leaders who are unfit to lead Holy Orders
+		abdicate_holy_order_if_religion_changes_effect = yes
+	}
 
 	option = {
 		name = "EVTOPTA40000"
@@ -2830,6 +2835,10 @@ diploresponse_event = {
 	trigger = {
 		ai = no
 	}
+	immediate = {
+		#Clean-up leaders who are unfit to lead Holy Orders
+		abdicate_holy_order_if_religion_changes_effect = yes
+	}
 
 	desc = "EVTDESC232"
 
@@ -2851,6 +2860,10 @@ diploresponse_event = {
 	trigger = {
 		ai = no
 	}
+	immediate = {
+		#Clean-up leaders who are unfit to lead Holy Orders
+		abdicate_holy_order_if_religion_changes_effect = yes
+	}
 
 	desc = "EVTDESC233"
 
@@ -3067,6 +3080,11 @@ diploresponse_event = {
 
 	desc = "EVTDESC240"
 
+	immediate = {
+		#Clean-up leaders who are unfit to lead Holy Orders
+		abdicate_holy_order_if_religion_changes_effect = yes
+	}
+
 	option = {
 		name = "OK"
 	}
@@ -3092,6 +3110,10 @@ diploresponse_event = {
 			}
 		}
 	}
+	immediate = {
+		#Clean-up leaders who are unfit to lead Holy Orders
+		abdicate_holy_order_if_religion_changes_effect = yes
+	}
 
 	desc = "EVTDESC241"
 
@@ -4009,6 +4031,10 @@ diploresponse_event = {
 	trigger = {
 		ai = no
 	}
+	immediate = {
+		#Clean-up leaders who are unfit to lead Holy Orders
+		abdicate_holy_order_if_religion_changes_effect = yes
+	}
 
 	desc = "EVTDESC293"
 
@@ -4027,6 +4053,10 @@ diploresponse_event = {
 	trigger = {
 		ai = no
 	}
+	immediate = {
+		#Clean-up leaders who are unfit to lead Holy Orders
+		abdicate_holy_order_if_religion_changes_effect = yes
+	}
 
 	desc = "EVTDESC294"
 
@@ -5182,7 +5212,7 @@ narrative_event = {
 			}
 			add_artifact = scepter_hellenic_fylkir
 		}
-		#hidden_effect = { reformation_god_names_changes_effect = yes }
+		hidden_effect = { reformation_god_names_changes_effect = yes }
 		#Opinion boost to new religious head (if any) and Reformer.
 		if = {
 			limit = { 

diff --git a/ChristianSchisms/events/religious_events.txt b/ChristianSchisms/events/religious_events.txt
@@ -6089,6 +6089,8 @@ character_event = {
 				imprison = no
 			}
 		}
+		#Clean-up leaders who are unfit to lead Holy Orders
+		abdicate_holy_order_if_religion_changes_effect = yes
 	}
 
 	option = { # No sympathy for the old religion

diff --git a/ChristianSchisms/history/characters/armenian.txt b/ChristianSchisms/history/characters/armenian.txt
@@ -1449,7 +1449,6 @@
 	1216.1.1={
 		birth="1216.1.1"
 	}
-	#1231 married Hethum I 
 	1252.1.23={
 		death="1252.1.23"
 	}
@@ -3581,8 +3580,10 @@
 	1210.1.1={
 		birth="1210.1.1"
 	}
-	1226.1.1={
-		add_spouse=30998
+	1226.1.1={ 
+		effect = {
+  			add_betrothal = 30998
+   		}
 	}
 	1254.1.1={
 		add_trait=sympathy_pagans

diff --git a/ChristianSchisms/history/characters/lombard.txt b/ChristianSchisms/history/characters/lombard.txt
@@ -6715,7 +6715,7 @@
 }
 221100={
 	name=Adaloald
-	dynasty=1061087
+	dynasty=1062609
 	female=no
 	religion=orthodox
 	culture=lombard