Fixing things

events/dlc/ep3/ep3_decisions_events.txt

@@ -7358,10 +7358,10 @@ ep3_decisions_event.6001 = {
 					has_trait = craven
 				}
 			}
-			modifier = { # Asen and Peter always try to go to war with you
-				add = 1000
-				primary_title = title:d_laamp_asen
-			}
+#			modifier = { # Asen and Peter always try to go to war with you
+#				add = 1000
+#				primary_title = title:d_laamp_asen
+#			}
 		}
 	}
 	
@@ -7383,10 +7383,10 @@ ep3_decisions_event.6001 = {
 				factor = 2
 				root_military_strength_higher_than_military_target_value < target_military_strength_root_value
 			}
-			modifier = { # Asen and Peter always try to go to war with you
-				factor = 0
-				primary_title = title:d_laamp_asen
-			}
+#			modifier = { # Asen and Peter always try to go to war with you
+#				factor = 0
+#				primary_title = title:d_laamp_asen
+#			}
 		}
 	}
 	
@@ -7609,10 +7609,10 @@ ep3_decisions_event.6001 = {
 					has_trait = callous
 				}
 			}
-			modifier = { # Asen and Peter always try to go to war with you
-				factor = 0
-				primary_title = title:d_laamp_asen
-			}
+#			modifier = { # Asen and Peter always try to go to war with you
+#				factor = 0
+#				primary_title = title:d_laamp_asen
+#			}
 		}
 	}
 	

events/dlc/ep3/ep3_laamp_events.txt

@@ -1186,6 +1186,410 @@ ep3_laamps.0032 = {
 	}
 }
 
+ep3_laamps.1030 = {
+		type = character_event
+		window = fullscreen_event
+		title = ep3_laamps.1030.t
+		desc = {
+			desc = ep3_laamps.1030.desc
+			first_valid = {
+				triggered_desc = {
+					trigger = { exists = scope:laamp_heir }
+					desc = ep3_laamps.1030.heir
+				}
+				triggered_desc = {
+					trigger = { exists = scope:laamp_liege }
+					desc = ep3_laamps.1030.liege
+				}
+				desc = ep3_laamps.1030.new
+			}
+		}
+		theme = realm
+		left_portrait = {
+			character = root
+			animation = marshal
+		}
+		lower_right_portrait = scope:laamp_inheritor
+		override_background = { reference = ep3_fullscreen_adventurer_positive }
+		cooldown = { days = 5 }
+	
+		trigger = { exists = scope:laamp_inheritor }
+	
+		immediate = {
+			# Save scopes for loc
+			primary_title = { save_scope_as = old_primary_title }
+			capital_province = { save_scope_as = old_capital_province }
+			if = {
+				limit = { top_liege != this }
+				liege = { save_scope_as = old_liege }
+			}
+			# Transfer landed titles
+			every_held_title = {
+				title_tier > barony
+				limit = {
+					OR = {
+						is_landless_type_title = no
+						is_nomad_title = yes
+					}
+				}
+				add_to_list = target_titles
+			}
+			create_title_and_vassal_change = {
+				type = conquest
+				save_scope_as = change
+				add_claim_on_loss = no
+			}
+			hidden_effect = {
+				every_in_list = {
+					list = target_titles
+					change_title_holder_include_vassals = {
+						holder = scope:laamp_inheritor
+						change = scope:change
+					}
+				}
+				resolve_title_and_vassal_change = scope:change
+			}
+			# Create Adventurer
+			create_landless_minority_title_effect = {
+				REASON = flag:voluntary
+				FLAVOR_CHAR = scope:laamp_inheritor
+			}
+			scope:laamp_inheritor = {
+				# Tooltip for player
+				custom_tooltip = become_landless_adventurer_decision_title_scope_tt
+				# Create a loving family so inheritance isn't so borked
+				if = {
+					limit = { has_character_flag = new_laamp_inheritor }
+					trigger_event = game_rule.1001
+					remove_character_flag = new_laamp_inheritor
+				}
+			}
+			scope:old_liege ?= { trigger_event = ep3_laamps.1032 }
+			adventurer_prestige_reset_effect = yes
+			hidden_effect = {
+				every_held_title = {
+					limit = {
+						is_noble_family_title = yes
+					}
+					root = { destroy_title = prev }
+				}
+			}
+		}
+	
+		option = {
+			name = ep3_laamps.1030.a
+			create_landless_minority_title_tooltip_effect = yes
+			add_prestige = medium_prestige_gain
+			add_character_modifier = {
+				modifier = ep3_voluntary_laamp_character_modifier
+				years = 5
+			}
+		}
+	}
+	
+	# Liege event
+	ep3_laamps.1032 = {
+		type = letter_event
+		opening = ep3_laamps.1032.opening
+		desc = ep3_laamps.1032.desc
+		sender = scope:minority_leader
+	
+		trigger = { is_ai = no }
+	
+		immediate = {
+			scope:minority_leader = { create_landless_minority_title_tooltip_effect = yes }
+		}
+	
+		option = {
+			name = ep3_laamps.1032.a
+		}
+	}
+	##################################################
+	# Become Adventurer - Revocation
+	# by Joe Parkin
+	# 0040-0041
+	##################################################
+	
+	# Come back
+	
+	scripted_trigger ep3_laamp_revoked_title_trigger = {
+		recent_history = { type = revoked days = 1 }
+		previous_holder = root
+	}
+	
+	ep3_laamps.0040 = {
+		type = character_event
+		window = fullscreen_event
+		title = ep3_laamps.0040.t
+		desc = {
+			first_valid = {
+				triggered_desc = {
+					trigger = {
+						scope:actor = { is_close_family_of = root }
+					}
+					desc = ep3_laamps.0040.family
+				}
+				desc = ep3_laamps.0040.other
+			}
+			desc = ep3_laamps.0040.desc
+		}
+		theme = realm
+		left_portrait = {
+			character = root
+			animation = marshal
+		}
+		lower_left_portrait = scope:alt_1
+		lower_center_portrait = scope:alt_2
+		lower_right_portrait = scope:alt_3
+		override_background = { reference = ep3_fullscreen_adventurer_negative }
+		cooldown = { days = 5 }
+	
+		# The AI was managing to get this event somehow.
+		trigger = {
+			is_ai = no
+			NOT = { has_character_flag = become_laamp_event_cooldown }
+		}
+	
+		immediate = {
+			add_character_flag = {
+				flag = become_laamp_event_cooldown
+				days = 5
+			}
+			# Find alternative rulers to play as
+			find_playable_relatives_effect = yes
+			# Portrait scopes
+			if = {
+				limit = {
+					NOR = {
+						exists = scope:alt_3
+						scope:alt_1 ?= scope:actor
+						scope:alt_2 ?= scope:actor
+					}
+				}
+				scope:actor = { save_scope_as = alt_3 }
+			}
+			# Create Adventurer
+			hidden_effect = {
+				create_landless_adventurer_title_effect = {
+					REASON = flag:revocation
+					FLAVOR_CHAR = scope:actor
+				}
+			}
+			adventurer_prestige_reset_effect = yes
+		}
+	
+		option = {
+			name = ep3_laamps.0040.a
+			create_landless_adventurer_title_tooltip_effect = yes
+			add_internal_flag = special
+			scope:actor = { trigger_event = ep3_laamps.0042 }
+		}
+	
+		option = {
+			name = ep3_laamps.0001.b
+			trigger = { exists = scope:alt_1 }
+			laamp_switch_playable_character_effect = { NEW_CHARACTER = scope:alt_1 }
+		}
+		option = {
+			name = ep3_laamps.0001.c
+			trigger = { exists = scope:alt_2 }
+			laamp_switch_playable_character_effect = { NEW_CHARACTER = scope:alt_2 }
+		}
+		option = {
+			name = ep3_laamps.0001.d
+			trigger = {
+				exists = scope:alt_3
+				scope:alt_3 = { playable_relative_trigger = yes }
+			}
+			laamp_switch_playable_character_effect = { NEW_CHARACTER = scope:alt_3 }
+		}
+		option = {
+			name = ep3_laamps.0001.e
+			laamp_game_over_option_effect = yes
+		}
+	}
+	
+	# Setup event
+	ep3_laamps.0041 = {
+		type = character_event
+		hidden = yes
+	
+		trigger = {
+			has_ep3_dlc_trigger = yes
+			is_landed = no
+			is_valid_for_laampdom = yes
+		}
+	
+		immediate = {
+			save_scope_as = adventurer
+			# AI chance
+			if = {
+				limit = {
+					is_ai = yes
+					ai_can_valid_to_create_laamp_trigger = yes
+					trigger_if = { # Don't fill the adventurer pool with revoked counts
+						limit = {
+							scope:lost_primary_title.tier <= tier_county
+						}
+						global_variable_list_size = {
+							name = laamps_tally
+							value < seventyfive_percent_of_max_desired_laamps_value
+						}
+					}
+				}
+				random = {
+					chance = 0
+					modifier = { add = ep3_laamp_chance_score_value }
+					create_landless_adventurer_title_effect = {
+						REASON = flag:revocation
+						FLAVOR_CHAR = scope:actor
+					}
+					scope:actor = { trigger_event = ep3_laamps.0042 }
+				}
+			}
+			# Player event
+			else = {
+				trigger_event = { id = ep3_laamps.0040 }
+			}
+		}
+	}
+	
+	# Revoker event
+	ep3_laamps.0042 = {
+		type = letter_event
+		opening = ep3_laamps.0003.opening
+		desc = ep3_laamps.0042.desc
+		sender = scope:adventurer
+	
+		trigger = { is_ai = no }
+	
+		immediate = {
+			create_landless_adventurer_title_tooltip_effect = yes
+		}
+	
+		option = {
+			name = ep3_laamps.0042.a
+		}
+	}
+ep3_laamps.1030 = {
+		type = character_event
+		window = fullscreen_event
+		title = ep3_laamps.1030.t
+		desc = {
+			desc = ep3_laamps.1030.desc
+			first_valid = {
+				triggered_desc = {
+					trigger = { exists = scope:laamp_heir }
+					desc = ep3_laamps.1030.heir
+				}
+				triggered_desc = {
+					trigger = { exists = scope:laamp_liege }
+					desc = ep3_laamps.1030.liege
+				}
+				desc = ep3_laamps.1030.new
+			}
+		}
+		theme = realm
+		left_portrait = {
+			character = root
+			animation = marshal
+		}
+		lower_right_portrait = scope:laamp_inheritor
+		override_background = { reference = ep3_fullscreen_adventurer_positive }
+		cooldown = { days = 5 }
+	
+		trigger = { exists = scope:laamp_inheritor }
+	
+		immediate = {
+			# Save scopes for loc
+			primary_title = { save_scope_as = old_primary_title }
+			capital_province = { save_scope_as = old_capital_province }
+			if = {
+				limit = { top_liege != this }
+				liege = { save_scope_as = old_liege }
+			}
+			# Transfer landed titles
+			every_held_title = {
+				title_tier > barony
+				limit = {
+					OR = {
+						is_landless_type_title = no
+						is_nomad_title = yes
+					}
+				}
+				add_to_list = target_titles
+			}
+			create_title_and_vassal_change = {
+				type = conquest
+				save_scope_as = change
+				add_claim_on_loss = no
+			}
+			hidden_effect = {
+				every_in_list = {
+					list = target_titles
+					change_title_holder_include_vassals = {
+						holder = scope:laamp_inheritor
+						change = scope:change
+					}
+				}
+				resolve_title_and_vassal_change = scope:change
+			}
+			# Create Adventurer
+			create_landless_minority_title_effect = {
+				REASON = flag:voluntary
+				FLAVOR_CHAR = scope:laamp_inheritor
+			}
+			scope:laamp_inheritor = {
+				# Tooltip for player
+				custom_tooltip = become_landless_adventurer_decision_title_scope_tt
+				# Create a loving family so inheritance isn't so borked
+				if = {
+					limit = { has_character_flag = new_laamp_inheritor }
+					trigger_event = game_rule.1001
+					remove_character_flag = new_laamp_inheritor
+				}
+			}
+			scope:old_liege ?= { trigger_event = ep3_laamps.1032 }
+			adventurer_prestige_reset_effect = yes
+			hidden_effect = {
+				every_held_title = {
+					limit = {
+						is_noble_family_title = yes
+					}
+					root = { destroy_title = prev }
+				}
+			}
+		}
+	
+		option = {
+			name = ep3_laamps.1030.a
+			create_landless_minority_title_tooltip_effect = yes
+			add_prestige = medium_prestige_gain
+			add_character_modifier = {
+				modifier = ep3_voluntary_laamp_character_modifier
+				years = 5
+			}
+		}
+	}
+	
+	# Liege event
+	ep3_laamps.1032 = {
+		type = letter_event
+		opening = ep3_laamps.1032.opening
+		desc = ep3_laamps.1032.desc
+		sender = scope:minority_leader
+	
+		trigger = { is_ai = no }
+	
+		immediate = {
+			scope:minority_leader = { create_landless_minority_title_tooltip_effect = yes }
+		}
+	
+		option = {
+			name = ep3_laamps.1032.a
+		}
+	}
+
 ##################################################
 # Become Adventurer - Revocation
 # by Joe Parkin

events/dlc/fp1/fp1_jomsvikings_events.txt

@@ -620,7 +620,7 @@ scripted_trigger fp1_viable_target_for_jomsviking_aggression_trigger = {
 	holder = root
 	
 	# The Jomsvikings won't pillage faithful non-reformist Asatru. Much.
-	NOT = { faith = faith:norse_pagan }
+	NOT = { faith = faith:folketro }
 
 	# Otherwise, they need something coastal or nearby.
 	OR = {
@@ -684,7 +684,7 @@ fp1_jomsvikings.0011 = {
 			# Reformed Asatruans.
 			triggered_desc = {
 				trigger = {
-					religion = religion:germanic_religion
+					religion = religion:folkgerman_religion
 					faith = {
 						NOT = { has_doctrine_parameter = unreformed }
 					}
@@ -695,7 +695,7 @@ fp1_jomsvikings.0011 = {
 			triggered_desc = {
 				trigger = {
 					NAND = {
-						religion = religion:germanic_religion
+						religion = religion:folkgerman_religion
 						faith = { has_doctrine_parameter = unreformed }
 					}
 				}
@@ -712,7 +712,7 @@ fp1_jomsvikings.0011 = {
 			# Ideological, reformist.
 			triggered_desc = {
 				trigger = {
-					religion = religion:germanic_religion
+					religion = religion:folkgerman_religion
 					faith = {
 						NOT = { has_doctrine_parameter = unreformed }
 					}
@@ -767,7 +767,7 @@ fp1_jomsvikings.0011 = {
 		# Extra rage is reserved for Germanic reformists, as they're the traitoriest traitors.
 		modifier = {
 			add = 1
-			religion = religion:germanic_religion
+			religion = religion:folkgerman_religion
 			faith = {
 				NOT = { has_doctrine_parameter = unreformed }
 			}
@@ -780,7 +780,7 @@ fp1_jomsvikings.0011 = {
 		## Reformed Germanics get a shorter cooldown.
 		if = {
 			limit = {
-				religion = religion:germanic_religion
+				religion = religion:folkgerman_religion
 				faith = {
 					NOT = { has_doctrine_parameter = unreformed }
 				}
@@ -2074,7 +2074,7 @@ fp1_jomsvikings.1001 = {
 	# The gods forsake us!
 	option = {
 		name = fp1_jomsvikings.1001.a
-		trigger = { faith = faith:norse_pagan }
+		trigger = { faith = faith:folketro }
 
 		# No more benefits for pious Norse pagans.
 		custom_tooltip = fp1_jomsvikings.1001.a.tt
@@ -2090,7 +2090,7 @@ fp1_jomsvikings.1001 = {
 	option = {
 		name = fp1_jomsvikings.1001.b
 		trigger = {
-			NOT = { faith = faith:norse_pagan }
+			NOT = { faith = faith:folketro }
 		}
 
 		# No more Jomsviking piracy!
@@ -2107,7 +2107,7 @@ fp1_jomsvikings.1001 = {
 	option = {
 		name = fp1_jomsvikings.1001.c
 		trigger = {
-			NOT = { faith = faith:norse_pagan }
+			NOT = { faith = faith:folketro }
 		}
 
 		# No more Jomsviking piracy!
@@ -2208,7 +2208,7 @@ fp1_jomsvikings.1011 = {
 		every_player = {
 			limit = {
 				OR = {
-					religion = religion:germanic_religion
+					religion = religion:folkgerman_religion
 					save_temporary_scope_as = neighbouring_players
 					scope:founder = {
 						any_neighboring_and_across_water_top_liege_realm_owner = { this = scope:neighbouring_players }

events/dlc/fp1/fp1_major_decision_events.txt

@@ -543,7 +543,7 @@ fp1_major_decisions.0031 = {
 		every_player = {
 			limit = {
 				OR = {
-					religion = religion:germanic_religion
+					religion = religion:folkgerman_religion
 					save_temporary_scope_as = neighbouring_players
 					scope:founder = {
 						any_neighboring_and_across_water_top_liege_realm_owner = { this = scope:neighbouring_players }

events/dlc/fp1/fp1_yearly_events_oltner.txt

@@ -1141,7 +1141,7 @@ fp1_yearly.2200 = {
 		
 		OR = {
 			culture = { has_cultural_pillar = heritage_north_germanic }
-			religion = religion:germanic_religion
+			religion = religion:folkgerman_religion
 		}
 		
 		OR = {
@@ -2230,7 +2230,7 @@ fp1_yearly.2600 = {
 		
 		OR = {
 			culture = { has_cultural_pillar = heritage_north_germanic }
-			religion = religion:germanic_religion
+			religion = religion:folkgerman_religion
 		}
 		
 		faith = {

events/dlc/fp3/fp3_yearly_events_ola_batch_1.txt

@@ -3456,7 +3456,7 @@ scripted_trigger fp3_not_norse_trigger = {
 	NOR = {
 		culture = { has_cultural_pillar = heritage_north_germanic }
 		culture = { has_cultural_tradition = tradition_fp1_northern_stories }
-		has_religion = religion:germanic_religion
+		has_religion = religion:folkgerman_religion
 	}
 }