Monetarist holy sites, fixes

common/landed_titles/atlantica.txt

@@ -622,6 +622,7 @@ e_atlantica = {
 				holy_site = americanist
 				holy_site = libertarian
 				holy_site = consumerist
+				holy_site = monetarist
 				holy_site = thelemic
 				holy_site = thelemic_reformed
 				holy_site = occultist
@@ -1215,6 +1216,7 @@ e_atlantica = {
 				holy_site = thelemic_reformed
 				holy_site = shinto
 				holy_site = jewish
+				holy_site = monetarist
 
 				b_washington_DC = {
 					pentarchy = yes

common/landed_titles/california.txt

@@ -447,6 +447,7 @@ e_california = {
 				holy_site = cetic
 				holy_site = shinto
 				holy_site = amazonian
+				holy_site = monetarist
 
 				b_fort_point_CA = {}
 				b_alcatraz_CA = {}

common/landed_titles/dixie.txt

@@ -191,6 +191,7 @@ e_dixie = {
 				holy_site = evangelical
 				holy_site = revelationist
 				holy_site = revelationist_reformed
+				holy_site = monetarist
 				motowner = "Allah's Garden"
 				muscogee = "Standing Peachtree"
 

common/landed_titles/grand_virginia.txt

@@ -191,7 +191,7 @@ e_grand_virginia = {
 
 				b_chattanooga_TN = {}
 				b_chickamauga_GA = {
-					cherokee = "Tsikama�gi"
+					cherokee = "Tsikamagi"
 				}
 				b_ooltewah_TN = {}
 				b_hixson_TN = {}
@@ -804,6 +804,7 @@ e_grand_virginia = {
 			c_louisville = {
 				color = { 20 148 209 }
 				color2={ 220 220 20 }
+				holy_site = monetarist #fort knox
 
 				b_louisville_KY = {}
 				b_jeffersontown_KY = {}

common/laws/atewww_succession_laws.txt

@@ -108,4 +108,38 @@ succession_laws = {
 			}
 		}
 	}
+	succ_constitutional_elective = {
+		oldest_child_opinion = -5
+		child_opinion = -5
+		dynasty_opinion = -5
+		feudal_opinion = 10
+		potential = {
+			holder_scope = {
+				government = constitutional_rep
+				is_nomadic = no
+				is_merchant_republic = no
+				is_patrician = no
+			}
+			NOT = { holder_scope = { government = confucian_bureaucracy } }
+			NOT = { holder_scope = { government = chinese_imperial_government } }
+
+		}
+		allow = {
+			custom_tooltip = {
+				text = not_forced_tt
+				hidden_tooltip = {
+					holder_scope = { NOT = { has_character_flag = liege_forced_succ_law } }
+				}
+			}
+		}
+		effect = {
+			succession = {
+				base_type = feudal_elective
+				voting_rules = constitutional_elective
+			}
+		}
+		revoke_allowed = {
+			always = no
+		}			
+	}
 }

common/laws/crown_laws.txt

@@ -417,6 +417,29 @@ de_jure_laws = {
 				revoke_law = crown_authority_2
 				revoke_law = crown_authority_3
 				revoke_law = crown_authority_4
+				if = {
+					limit = {
+						government = consumerist_government
+						ROOT = { 
+							OR = {
+								has_law = succ_gavelkind
+								has_law = succ_elective_gavelkind
+								has_law = succ_primogeniture
+								has_law = succ_ultimogeniture
+							}
+						}
+					}
+					ROOT = {
+						if = {
+							limit = { is_law_potential = succ_feudal_elective }
+							add_law = { law = succ_feudal_elective opinion_effect = no }
+						}
+						else_if = {
+							limit = { is_law_potential = succ_seniority }
+							add_law = { law = succ_seniority opinion_effect = no }
+						}
+					}
+				}
 			}
 			#set_appoint_generals = yes
 			#set_appoint_regents = yes

common/laws/succession_laws.txt

@@ -2353,6 +2353,7 @@ gender_laws = {
 				NOT = { has_religion_feature = religion_patriarchal }
 				NOT = { religion = amazonian }
 				OR = {
+					religion = libertarian
 					matriarchal_religion = yes
 					any_owned_bloodline = {
 						has_bloodline_flag = bloodline_enatic

common/laws/ze_council_power_laws.txt

@@ -245,6 +245,29 @@ laws = {
 								years = 5
 							}
 						}
+						if = {
+							limit = {
+								government = consumerist_government
+								ROOT = { 
+									OR = {
+										has_law = succ_gavelkind
+										has_law = succ_elective_gavelkind
+										has_law = succ_primogeniture
+										has_law = succ_ultimogeniture
+									}
+								}
+							}
+							ROOT = {
+								if = {
+									limit = { is_law_potential = succ_feudal_elective }
+									add_law = { law = succ_feudal_elective opinion_effect = no }
+								}
+								else_if = {
+									limit = { is_law_potential = succ_seniority }
+									add_law = { law = succ_seniority opinion_effect = no }
+								}
+							}
+						}
 					}
 				}
 				revoke_law = law_voting_power_0

common/laws/ze_demesne_laws.txt

@@ -165,7 +165,7 @@ laws = {
 				}
 			}
 			conditional_tooltip = {
-				trigger = { semi_equal_religion = no }
+				trigger = { holder_scope = { semi_equal_religion = no } }
 				custom_tooltip = {
 					text = TT_HAS_TOLERANCE_3
 					holder_scope = { capital_scope = { TECH_CULTURE_FLEX = 3 } }
@@ -318,7 +318,7 @@ laws = {
 				holder_scope = { has_religion_feature = religion_patriarchal }
 			}
 			conditional_tooltip = {
-				trigger = { semi_equal_religion = no }
+				trigger = { holder_scope = { semi_equal_religion = no } }
 				custom_tooltip = {
 					text = TT_HAS_TOLERANCE_4
 					holder_scope = { capital_scope = { TECH_CULTURE_FLEX = 4 } }
@@ -475,7 +475,7 @@ laws = {
 				}
 			}
 			conditional_tooltip = {
-				trigger = { semi_equal_religion = no }
+				trigger = { holder_scope = { semi_equal_religion = no } }
 				custom_tooltip = {
 					text = TT_HAS_TOLERANCE_5
 					holder_scope = { capital_scope = { TECH_CULTURE_FLEX = 5 } }
@@ -629,7 +629,7 @@ laws = {
 						holder_scope = { has_religion_feature = religion_patriarchal }
 					}
 					conditional_tooltip = {
-						trigger = { semi_equal_religion = no }
+						trigger = { holder_scope = { semi_equal_religion = no } }
 						custom_tooltip = {
 							text = TT_HAS_TOLERANCE_6
 							holder_scope = { capital_scope = { TECH_CULTURE_FLEX = 6 } }

common/objectives/00_ambitions.txt

@@ -836,6 +836,7 @@ obj_get_married = {
 		prisoner = no
 		is_marriage_adult = yes
 		NOT = { trait = celibate }
+		NOT = { trait = amazon_trait }
 		NOT = { is_incapable = yes }
 		NOT = { trait = eunuch }
 		NOT = { is_ascetic_trigger = yes }
@@ -908,8 +909,10 @@ obj_get_married = {
 				is_ruler = no
 				age = 40
 			}
+			can_marry = no
 			is_pope = yes
 			trait = celibate
+			trait = amazon_trait
 			is_incapable = yes
 			trait = eunuch
 			is_ascetic_trigger = yes
@@ -967,6 +970,7 @@ obj_marry_ruler = {
 		prisoner = no
 		is_marriage_adult = yes
 		NOT = { trait = celibate }
+		NOT = { trait = amazon_trait }
 		NOT = { is_incapable = yes }
 		OR = {
 			AND = { 
@@ -1027,7 +1031,9 @@ obj_marry_ruler = {
 				is_ruler = no
 				age = 45
 			}
+			can_marry = no
 			trait = celibate
+			trait = amazon_trait
 			is_incapable = yes
 		}
 	}

common/objectives/00_focuses.txt

@@ -190,6 +190,11 @@ focus_seduction = {
 			factor = 0
 			trait = chaste
 		}
+		modifier = {
+			factor = 0.25
+			trait = amazon_trait
+			NOT = { trait = homosexual }
+		}
 		modifier = {
 			factor = 0
 			has_game_rule = {

common/objectives/atewww_ambitions.txt

@@ -28,6 +28,7 @@ obj_marry_lover = {
 		prisoner = no
 		is_marriage_adult = yes
 		NOT = { trait = celibate }
+		NOT = { trait = amazon_trait }
 		NOT = { is_incapable = yes }
 		NOT = { trait = eunuch }
 		NOT = { is_ascetic_trigger = yes }
@@ -116,8 +117,10 @@ obj_marry_lover = {
 				is_ruler = no
 				age = 40
 			}
+			can_marry = no
 			is_pope = yes
 			trait = celibate
+			trait = amazon_trait
 			is_incapable = yes
 			trait = eunuch
 			is_ascetic_trigger = yes

common/religions/00_religions.txt

@@ -2825,9 +2825,6 @@ oldworld = {
 	}
 
 	consumerist = {
-		ai_convert_same_group = 2
-		ai_convert_other_group = 2
-
 		graphical_culture = muslimgfx
 
 		icon = 17
@@ -2886,8 +2883,6 @@ oldworld = {
 	}
 
 	monetarist = { #...
-		ai_convert_same_group = 2
-		ai_convert_other_group = 2
 		graphical_culture = muslimgfx
 
 		icon = 17
@@ -3866,8 +3861,8 @@ indian_group = {
 	ai_peaceful = yes # Will make Hordes lose their super aggressiveness
 	hostile_within_group = yes
 
-	ai_convert_same_group = 2 # try to convert if ai_zeal is high
-	ai_convert_other_group = 2	# always try to convert
+	ai_convert_same_group = 1 # try to convert if ai_zeal is high
+	ai_convert_other_group = 1	# always try to convert
 
 	color = { 0.8 0.4 0.0 }