33th Bug Crusade

common/retinue_subunits/00_retinue_subunits.txt

@@ -1782,7 +1782,7 @@ wc_ret_rel_scourge = {
 
 	potential = {
 		# is_tribal = no
-		OR {
+		OR = {
 			religion = death_god
 			culture = scourge
 		}

common/scripted_effects/wc_scripted_effects.txt

@@ -4030,63 +4030,77 @@ destroy_temporary_landless_title_effect = {
 
 # THIS abdicates titles and transfers wealth to PREV
 this_abdicate_transfer_wealth_to_prev_effect = {
-	save_event_target_as = target_ruler
-	PREV = { save_event_target_as = target_heir }
+	if = {
+		limit = { NOT = { has_character_flag = ongoing_abdication_flag } }
+		save_event_target_as = target_ruler
+		PREV = { save_event_target_as = target_heir }
+
+		set_character_flag = ongoing_abdication_flag
 
-	hidden_effect = {
-		# Transfers wealth and artifacts
-		event_target:target_heir = { wealth = event_target:target_ruler }
-		clear_wealth = yes
-		any_artifact = {
-			transfer_artifact = { from = event_target:target_ruler to = event_target:target_heir }
+		hidden_effect = {
+			# Transfers wealth and artifacts
+			event_target:target_heir = { wealth = event_target:target_ruler }
+			clear_wealth = yes
+			any_artifact = {
+				transfer_artifact = { from = event_target:target_ruler to = event_target:target_heir }
+			}
 		}
-	}
-	abdicate_to = PREV
-	hidden_effect = {
-		# Lose claims on target_heir titles
-		any_claim = {
-			limit = {
-				holder_scope = { character = event_target:target_heir }
+		abdicate_to = PREV
+		hidden_effect = {
+			# Lose claims on target_heir titles
+			any_claim = {
+				limit = {
+					holder_scope = { character = event_target:target_heir }
+				}
+				remove_claim = event_target:target_ruler
 			}
-			remove_claim = event_target:target_ruler
+			move_character = event_target:target_heir
 		}
-		move_character = event_target:target_heir
+
+		clr_character_flag = ongoing_abdication_flag
+
+		clear_event_target =  target_ruler
+		clear_event_target =  target_heir
 	}
-
-	clear_event_target =  target_ruler
-	clear_event_target =  target_heir
 }
 this_abdicate_transfer_wealth_to_play_prev_effect = {
-	save_event_target_as = target_ruler
-	PREV = { save_event_target_as = target_heir }
-
-	hidden_effect = {
-		# Transfers wealth and artifacts
-		event_target:target_heir = {
-			create_temporary_landless_title_effect = yes	# Creates temporary landless title to avoid game over
-			wealth = event_target:target_ruler
-		}
-		clear_wealth = yes
-		any_artifact = {
-			transfer_artifact = { from = event_target:target_ruler to = event_target:target_heir }
+	if = {
+		limit = { NOT = { has_character_flag = ongoing_abdication_flag } }
+		save_event_target_as = target_ruler
+		PREV = { save_event_target_as = target_heir }
+
+		set_character_flag = ongoing_abdication_flag
+
+		hidden_effect = {
+			# Transfers wealth and artifacts
+			event_target:target_heir = {
+				create_temporary_landless_title_effect = yes	# Creates temporary landless title to avoid game over
+				wealth = event_target:target_ruler
+			}
+			clear_wealth = yes
+			any_artifact = {
+				transfer_artifact = { from = event_target:target_ruler to = event_target:target_heir }
+			}
+			set_player_character = event_target:target_heir	# THIS start playing PREV
 		}
-		set_player_character = event_target:target_heir	# THIS start playing PREV
-	}
-	abdicate_to = PREV
-	hidden_effect = {
-		# Lose claims on target_heir titles
-		any_claim = {
-			limit = {
-				holder_scope = { character = event_target:target_heir }
+		abdicate_to = PREV
+		hidden_effect = {
+			# Lose claims on target_heir titles
+			any_claim = {
+				limit = {
+					holder_scope = { character = event_target:target_heir }
+				}
+				remove_claim = event_target:target_ruler
 			}
-			remove_claim = event_target:target_ruler
+			move_character = event_target:target_heir
+			event_target:target_heir = { destroy_temporary_landless_title_effect = yes }	# Destroys title created in create_temporary_landless_title_effect
 		}
-		move_character = event_target:target_heir
-		event_target:target_heir = { destroy_temporary_landless_title_effect = yes }	# Destroys title created in create_temporary_landless_title_effect
+
+		clr_character_flag = ongoing_abdication_flag
+
+		clear_event_target =  target_ruler
+		clear_event_target =  target_heir
 	}
-
-	clear_event_target =  target_ruler
-	clear_event_target =  target_heir
 }
 
 fire_councilmember_king_effect = {

common/scripted_triggers/00_scripted_triggers.txt

@@ -1690,6 +1690,12 @@ is_inaccessible_trigger = { #Remember to write this "is_inaccessible_trigger = n
 		text = is_inaccessible_tooltip
 		hidden_tooltip = {
 			OR = {
+				# Warcraft
+				trait = in_ice_prison
+				trait = in_twisting_nether
+				trait = lost_corporeal_body
+				trait = sleeping_trait
+
 				has_character_flag = flag_holding_great_tribal_festival
 				trait = in_hiding
 				trait = on_hajj

common/scripted_triggers/wc_faction_scripted_triggers.txt

@@ -344,4 +344,12 @@ horde_can_be_centralized_faction_trigger = {
 alliance_can_be_centralized_faction_trigger = {
 	NOT = { has_game_rule = { name = political_faction_centralization value = uncentralized } }
 	NOT = { has_global_flag = centralized_alliance_flag }
+}
+has_alliances_with_faction_trigger = {
+	is_ruler = yes
+	any_independent_ruler = {
+		NOT = { character = PREV }
+		is_in_political_faction_trigger = yes
+		is_allied_with = PREV
+	}
 }

common/scripted_triggers/wc_scripted_plot_triggers.txt

@@ -2,7 +2,7 @@ can_be_killed_by_poisoned_wine_trigger = {
 	#Tribal/nomadic ruler organizing banquets... sounds weird... don't know why Paradox haven't disabled it
 	#Let's assume tribal monarchs have taverns and sometimes enter them
 	NOT = { government = tribal_government }
-	is_nomadic  no
+	is_nomadic = no
 
 	can_be_drunkard_trigger = yes
 }
@@ -15,7 +15,7 @@ can_be_killed_by_falling_trigger = {
 can_be_killed_by_archer_ambush_trigger = {
 	#Tribal/nomadic ruler touring in a carriage... sounds weird... don't know why Paradox haven't disabled it
 	is_tribal = no
-	is_nomadic  no
+	is_nomadic = no
 
 	dark_public_religion_trigger = no
 
@@ -25,7 +25,7 @@ can_be_killed_by_manure_explosion_trigger = {
 	#Tribal/nomadic ruler touring and entering taverns... sounds weird... don't know why Paradox haven't disabled it
 	#Let's assume tribal monarchs have taverns and sometimes enter them
 	NOT = { government = tribal_government }
-	is_nomadic  no
+	is_nomadic = no
 
 	is_humanoid_trigger = yes
 	dark_public_religion_trigger = no
@@ -50,7 +50,7 @@ can_be_killed_by_poisonous_snake_trigger = {
 }
 can_be_killed_by_balcony_plummet_trigger = {
 	is_tribal = no
-	is_nomadic  no
+	is_nomadic = no
 
 	is_humanoid_trigger = yes
 	dark_public_religion_trigger = no

decisions/rip_various_decisions.txt

@@ -9,6 +9,9 @@ targeted_decisions = {
 
 		}
 		potential = {
+			# Warcraft
+			NOT = { is_tributary = { type = political_faction suzerain = suzerain } }
+
 			is_tributary = yes
 			suzerain = { character = FROM }
 		}

events/wc_dark_cult_events.txt

@@ -1219,12 +1219,15 @@ character_event = {
 			add_trait = lich_king
 
 			FROMFROM = {
+				if = {
+					limit = { is_ruler = yes }
+					this_abdicate_transfer_wealth_to_play_prev_effect = yes
+				}
 				if = {
 					limit = {
 						is_alive = yes
 						is_dying = no
 					}
-					this_abdicate_transfer_wealth_to_play_prev_effect = yes
 					death = { death_reason = death_merged killer = ROOT }
 				}
 				remove_trait = lich_king
@@ -1245,10 +1248,7 @@ character_event = {
 
 			FROMFROM = {
 				if = {
-					limit = {
-						is_alive = yes
-						is_dying = no
-					}
+					limit = { has_character_modifier = legion_overlord }
 					remove_character_modifier = legion_overlord
 				}
 			}
@@ -1265,10 +1265,7 @@ character_event = {
 
 			FROMFROM = {
 				if = {
-					limit = {
-						is_alive = yes
-						is_dying = no
-					}
+					limit = { has_character_modifier = black_empire_overlord }
 					remove_character_modifier = black_empire_overlord
 				}
 			}

events/wc_politfaction_events.txt

@@ -152,12 +152,22 @@ character_event = {
 	hide_window = yes
 
 	trigger = {
-		FROMFROM = { is_in_political_faction_trigger = yes }
+		FROMFROM = {
+			is_alive = yes
+			is_dying = no
+
+			OR = {
+				is_in_political_faction_trigger = yes
+				has_alliances_with_faction_trigger = yes
+			}
+		}
 	}
 
 	immediate = {
 		log = "WCPLF.45 fired for [Root.GetBestName]"
-		FROMFROM = { character_event = { id = WCPLF.52 } }
+		FROMFROM = {
+			character_event = { id = WCPLF.52 days = 1 }	# Clears faction trait/modifier if something is wrong
+		}
 	}
 }
 # on_character_convert_religion
@@ -193,8 +203,18 @@ character_event = {
 
 	trigger = {
 		OR = {
-			ROOT = { is_in_political_faction_trigger = yes }
-			FROM = { is_in_political_faction_trigger = yes }
+			ROOT = {
+				OR = {
+					is_in_political_faction_trigger = yes
+					has_alliances_with_faction_trigger = yes
+				}
+			}
+			FROM = {
+				OR = {
+					is_in_political_faction_trigger = yes
+					has_alliances_with_faction_trigger = yes
+				}
+			}
 		}
 	}
 
@@ -206,7 +226,11 @@ character_event = {
 				limit = {
 					is_alive = yes
 					is_dying = no
-					is_in_political_faction_trigger = yes
+
+					OR = {
+						is_in_political_faction_trigger = yes
+						has_alliances_with_faction_trigger = yes
+					}
 				}
 				character_event = { id = WCPLF.52 days = 1 }	# Clears faction trait/modifier if something is wrong
 			}
@@ -216,7 +240,11 @@ character_event = {
 				limit = {
 					is_alive = yes
 					is_dying = no
-					is_in_political_faction_trigger = yes
+
+					OR = {
+						is_in_political_faction_trigger = yes
+						has_alliances_with_faction_trigger = yes
+					}
 				}
 				character_event = { id = WCPLF.52 days = 1 }	# Clears faction trait/modifier if something is wrong
 			}
@@ -235,7 +263,7 @@ character_event = {
 			# It means that character only need to clear alliances
 			AND = {
 				is_in_political_faction_trigger = no
-				is_ruler = yes
+				has_alliances_with_faction_trigger = yes
 			}
 			AND = {
 				is_member_of_horde_faction_trigger = yes

history/characters/42000_high_elf.txt

@@ -1167,8 +1167,7 @@
 	disallow_random_traits = yes
 	40.10.9={ birth=yes add_trait=creature_high_elf immortal_age=18 }
 	98.10.9={
-		add_trait = class_hunter_4
-		add_trait = class_warrior_4
+		add_trait = class_hunter_7
 	}
 	603.10.1={
 		remove_trait=creature_high_elf

history/characters/60000_63000_lordaeronian.txt

@@ -4157,7 +4157,10 @@
 	add_trait=paranoid
 	disallow_random_traits = yes
 	1.1.1={ birth=yes add_trait=creature_human }
-	1.1.1={ add_trait=class_mage_10 }
+	1.1.1={
+		add_trait=class_mage_10
+		add_trait=immortal immortal_age = 18
+	}
 	537.1.1={
 		add_spouse = 5001
 	}

history/characters/66000_zandalari.txt

@@ -8,7 +8,8 @@
 	disallow_random_traits = yes
 	382.1.1={ birth=yes add_trait=creature_troll }
 	400.1.1={
-		add_trait = class_loa_priest_9 immortal_age = 18
+		add_trait = class_loa_priest_9
+		add_trait=immortal immortal_age = 18
 	}
 	545.11.4 = {
 		create_bloodline = {

interface/coat_of_arms/coats_of_arms.txt

@@ -604,8 +604,8 @@ culture = {
 	textures = {
 		texture = {
 			file = "gfx\\coats_of_arms\\dynasties_orcish.tga"
-			size = { x = 8 y = 1 }
-			noOfFrames = 8
+			size = { x = 9 y = 1 }
+			noOfFrames = 9
 			color = 0
 			emblem = no
 			random = no # Do not use for random CoAs