Merge pull request #86 from rickinator9/feature/merge-vanilla-2.4.3

3-way merge 2.4.2 / 2.4.3 v3 beta / master

Author: loup99

WTWSMS/common/cb_types/00_cb_types.txt

@@ -340,8 +340,8 @@ other_claim = {
 			if = {
 				limit = {
 					OR = {
-						tag = k_papal_state
-						tag = d_fraticelli
+						title = k_papal_state
+						title = d_fraticelli
 					}
 				}
 				FROM = {
@@ -7191,10 +7191,10 @@ pagan_subjugation = {
 				any_war = {
 					AND = {
 						defender = { character = PREVPREV }
-						using_cb = pagan_subjugation
 						OR = {
+							using_cb = pagan_subjugation
 							using_cb = nomad_subjugation
-						}	
+						}
 					}
 				}
 			}
@@ -12058,8 +12058,21 @@ cb_liberate_nomad_duchy = {
 		factor = 100
 	}
 
-	ai_will_do = { 
+	ai_will_do = {
 		factor = 1
+		modifier = {
+			factor = 0.1
+			NOT = {
+				any_direct_de_jure_vassal_title = {
+					any_direct_de_jure_vassal_title = {
+						OR = {
+							holding_type = castle
+							holding_type = city
+						}
+					}
+				}
+			}
+		}
 	}
 }
 
@@ -12105,15 +12118,16 @@ cb_minor_clan_revolt = {
 	}
 
 	on_success_title = {
+		usurp_title_plus_barony_if_unlanded = { target = ROOT type = revolt }
+	
 		ROOT = {
-			set_government_type = feudal_government
-		
 			primary_title = {
 				set_title_nomad = { title = THIS status = no }
 			}
+			
+			set_government_type = feudal_government
 		}
 
-		usurp_title_plus_barony_if_unlanded = { target = ROOT type = revolt }
 		ROOT = {		
 			set_government_type = nomadic_government
 			set_defacto_liege = FROM
@@ -12179,6 +12193,10 @@ cb_minor_clan_revolt = {
 			}
 		}
 	}
+	
+	on_attacker_leader_death = {
+		end_war = invalid
+	}
 
 	attacker_ai_victory_worth = {
 		factor = -1 # always accept
@@ -12206,6 +12224,20 @@ nomad_subjugation = {
 	is_permanent = yes
 	can_ask_to_join_war = yes
 
+	can_use_gui = {
+	#higher_tier_than between ROOT and FROM would be better but its tooltip doesn't say anything about comparing character tiers
+		OR = {
+			ROOT = {
+				higher_tier_than = king
+				}
+			NOT = {
+				FROM = {
+					tier = emperor
+					}
+			}
+		}
+	}
+	
 	can_use = {
 		ROOT = {
 			is_nomadic = yes
@@ -12287,6 +12319,7 @@ nomad_subjugation = {
 				any_demesne_title = {
 					limit = {
 						higher_tier_than = ROOT
+						NOT = { controls_religion = yes }
 					}
 					ROOT = { grant_title = { target = PREV type = invasion } }
 					add_pressed_claim = PREV
@@ -12305,10 +12338,38 @@ nomad_subjugation = {
 				any_demesne_title = {
 					limit = {
 						tier = ROOT
+						NOT = { controls_religion = yes }
 					}
 					ROOT = { grant_title = { target = PREV type = invasion } }
 					add_pressed_claim = PREV
 				}
+
+				if = {
+					limit = {
+						any_demesne_title = {
+							NOT = { controls_religion = yes }
+						}
+					}
+					set_defacto_liege = ROOT
+				}
+				if = {
+					limit = {
+						any_demesne_title = {
+							controls_religion = yes
+						}
+					}
+					any_vassal = {
+						set_defacto_liege = ROOT
+					}
+					any_demesne_title = {
+						limit = {
+							NOT = { controls_religion = yes }
+						}
+						ROOT = {
+							grant_title = { target = PREV type = invasion }
+						}
+					}
+				}
 			}
 		}
 	}

WTWSMS/common/combat_tactics/00_combat_tactics.txt

@@ -39,6 +39,9 @@ harass_tactic = {
 			light_cavalry = 0.001
 			camel_cavalry = 0.001
 		}
+		NOT = {
+			horse_archers = 0.5
+		}
 	}
 
 	mean_time_to_happen = {
@@ -1231,6 +1234,9 @@ raid_tactic = {
 			light_cavalry = 0.2
 			camel_cavalry = 0.2
 		}
+		NOT = {
+			horse_archers = 0.5
+		}
 	}
 
 	mean_time_to_happen = {

WTWSMS/common/event_modifiers/00_event_modifiers.txt

@@ -1548,6 +1548,7 @@ broken_spirit = {
 expelled_jewish = {
 	icon = 3
 	diplomacy = -2
+	global_tax_modifier = -0.1
 }
 
 defied_church = {
@@ -2193,6 +2194,10 @@ mercenary_traditions = {
 	levy_size = 0.3
 	max_manpower_mult = 0.15
 }
+
+wol_debase_timer = {
+	icon = 1
+}
 student_of_strategy = {
 	icon = 2
 	martial = 1

WTWSMS/common/laws/succession_laws.txt

@@ -191,6 +191,12 @@ succession_laws = {
 						PREV = {
 							is_primary_holder_title = no
 						}
+						NOT = {
+							in_revolt = yes
+							succ_law_title = {
+								title = PREV
+							}
+						}
 					}
 				}
 				crownlaw_title = {
@@ -645,7 +651,17 @@ succession_laws = {
 
 	succ_patrician_elective = {
 		potential = {
-			is_primary_holder_title = yes
+			OR = {
+				is_primary_holder_title = yes
+				AND = {
+					holder_scope = {
+						in_revolt = yes
+						succ_law_title = {
+							title = PREVPREV
+						}
+					}
+				}
+			}
 			holder_scope = {
 				is_merchant_republic = yes
 			}

WTWSMS/common/nicknames/00_nicknames.txt

@@ -1512,7 +1512,7 @@ nick_the_wolf = {
 		}
 	}
 	chance = {
-		factor = 3
+		factor = 1
 		modifier = {
 			factor = 2
 			culture_group = altaic

WTWSMS/common/traits/02_traits.txt

@@ -97,8 +97,6 @@ holy_warrior = {
 
 	command_modifier = {
 		religious_enemy = 0.3
-		morale_defence = 0.1
-		damage = -0.1
 	}
 
 	male_compliment = COMPL_HOLY_WARRIOR