Merge pull request #93 from Libeccio-DD/Pact-of-Umar-Fix-Mk-II

Pact of Umar Fix Mk II
arkhometha · Jan 26, 2020 · d84972b · d84972b
2 parents 31d8723 + 741844f
commit d84972b
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 90 deletions.
diff --git a/HPM/decisions/Arabia.txt b/HPM/decisions/Arabia.txt
@@ -584,70 +584,16 @@ political_decisions = {
 				has_country_flag = shiite_country
 				has_country_flag = ibadi_country
 			}
-			OR = {
-				1151 = {
-					owned_by = THIS
-					NOT = { has_province_modifier = holy_city }
-				}
-				AND = {
-					has_country_flag = umar_pact
-					NOT = { has_country_modifier = jizya }
-					any_owned_province = {
-						any_pop = {
-							OR = {
-								has_pop_religion = catholic
-								has_pop_religion = protestant
-								has_pop_religion = mormon
-								has_pop_religion = orthodox
-								has_pop_religion = coptic
-								has_pop_religion = druze
-								has_pop_religion = jewish
-								has_pop_religion = yazidi
-								has_pop_religion = mahayana
-								has_pop_religion = gelugpa
-								has_pop_religion = theravada
-								has_pop_religion = hindu
-								has_pop_religion = shinto
-								has_pop_religion = sikh
-								has_pop_religion = animist
-							}
-						}
-					}
-				}
+			1151 = {
+				owned_by = THIS
+				NOT = { has_province_modifier = holy_city }
 			}
 		}
 
 		allow = {
-			OR = {
-				1151 = {
-					owned_by = THIS
-					NOT = { has_province_modifier = holy_city }
-				}
-				AND = {
-					has_country_flag = umar_pact
-					NOT = { has_country_modifier = jizya }
-					any_owned_province = {
-						any_pop = {
-							OR = {
-								has_pop_religion = catholic
-								has_pop_religion = protestant
-								has_pop_religion = mormon
-								has_pop_religion = orthodox
-								has_pop_religion = coptic
-								has_pop_religion = druze
-								has_pop_religion = jewish
-								has_pop_religion = yazidi
-								has_pop_religion = mahayana
-								has_pop_religion = gelugpa
-								has_pop_religion = theravada
-								has_pop_religion = hindu
-								has_pop_religion = shinto
-								has_pop_religion = sikh
-								has_pop_religion = animist
-							}
-						}
-					}
-				}
+			1151 = {
+				owned_by = THIS
+				NOT = { has_province_modifier = holy_city }
 			}
 		}
 
@@ -659,36 +605,6 @@ political_decisions = {
 				}
 				add_province_modifier = { name = holy_city duration = -1 }
 			}
-			random_owned = {
-				limit = {
-					owner = {
-						NOT = { has_country_modifier = jizya }
-						has_country_flag = umar_pact
-						any_owned_province = {
-							any_pop = {
-								OR = {
-									has_pop_religion = catholic
-									has_pop_religion = protestant
-									has_pop_religion = mormon
-									has_pop_religion = orthodox
-									has_pop_religion = coptic
-									has_pop_religion = druze
-									has_pop_religion = jewish
-									has_pop_religion = yazidi
-									has_pop_religion = mahayana
-									has_pop_religion = gelugpa
-									has_pop_religion = theravada
-									has_pop_religion = hindu
-									has_pop_religion = shinto
-									has_pop_religion = sikh
-									has_pop_religion = animist
-								}
-							}
-						}
-					}
-				}
-				owner = { add_country_modifier = { name = jizya duration = -1 } }
-			}
 		}
 		ai_will_do = {
 			factor = 1

diff --git a/HPM/decisions/arabian formation.txt b/HPM/decisions/arabian formation.txt
@@ -854,6 +854,35 @@ political_decisions = {
 					add_province_modifier = { name = pearl_season duration = 150 }
 				}
 			}
+			any_country = {
+				limit = {
+					exists = yes
+					has_country_flag = umar_pact
+					NOT = { has_country_modifier = jizya }
+					any_owned_province = {
+						any_pop = {
+							OR = {
+								has_pop_religion = catholic
+								has_pop_religion = protestant
+								has_pop_religion = mormon
+								has_pop_religion = orthodox
+								has_pop_religion = coptic
+								has_pop_religion = druze
+								has_pop_religion = jewish
+								has_pop_religion = yazidi
+								has_pop_religion = mahayana
+								has_pop_religion = gelugpa
+								has_pop_religion = theravada
+								has_pop_religion = hindu
+								has_pop_religion = shinto
+								has_pop_religion = sikh
+								has_pop_religion = animist
+							}
+						}
+					}
+				}
+				add_country_modifier = { name = jizya duration = -1 }
+			}
 
 		}
 		ai_will_do = { factor = 1 }