Merge events m->w from 2.4.5 to 2.5.2 #1

dworschak · Jul 10, 2016 · d1a28b2 · d1a28b2
1 parent fc55298
commit d1a28b2
Show file tree

Hide file tree

Showing 37 changed files with 4,908 additions and 2,874 deletions.
diff --git a/MOD/Witcher/events/married_life_events.txt b/MOD/Witcher/events/married_life_events.txt
diff --git a/MOD/Witcher/events/mourning_events.txt b/MOD/Witcher/events/mourning_events.txt
@@ -99,6 +99,7 @@ character_event = {
 			NOT = { trait = stressed }
 		}
 		any_sibling = {
+			is_adult = yes
 			is_female = no
 			is_alive = yes
 			NOT = { martial = 8 }
@@ -135,6 +136,7 @@ character_event = {
 		name = EVTOPTB24503
 		random_child = {
 			limit = { 
+				is_adult = yes
 				is_female = no
 				is_alive = yes
 				NOT = { martial = 8 }
@@ -549,10 +551,6 @@ character_event = {
 
 	is_triggered_only = yes
 
-	weight_multiplier = {
-		days = 1
-	}
-
 	option = {
 		name = EVTOPTA4140
 		add_character_modifier = {

diff --git a/MOD/Witcher/events/oldgods_blot_events.txt b/MOD/Witcher/events/oldgods_blot_events.txt
@@ -1642,10 +1642,6 @@ character_event = {
 			character_event = { id = TOG.640 days = 5 }
 		}
 	}
-
-	option = {
-		name = OK
-	}
 }
 
 # Prisoner 3 (Liege invisible)
@@ -1692,10 +1688,6 @@ character_event = {
 			character_event = { id = TOG.640 days = 5 }
 		}
 	}
-
-	option = {
-		name = OK
-	}
 }
 
 # Prisoner 4 (Liege invisible)
@@ -1742,10 +1734,6 @@ character_event = {
 			character_event = { id = TOG.640 days = 5 }
 		}
 	}
-
-	option = {
-		name = OK
-	}
 }
 
 # Feast Begins (Liege)
@@ -2105,10 +2093,6 @@ character_event = {
 			}
 		}
 	}
-
-	option = {
-		name = OK
-	}
 }
 
 # Gluttonous (Guest)
@@ -2647,10 +2631,6 @@ character_event = {
 			}		
 		}
 	}
-
-	option = {
-		name = OK
-	}
 }
 
 # Friendship Formed (Guest 2)
@@ -2781,15 +2761,11 @@ character_event = {
 					is_female = no
 				}
 				character_event = { id = TOG.664 }
-				add_lover = FROM
+				add_lover = ROOT
 				set_character_flag = feast_homosexual
 			}		
 		}
 	}
-
-	option = {
-		name = OK
-	}
 }
 
 # Homosexual Male (Guest 2)
@@ -2935,10 +2911,6 @@ character_event = {
 			}		
 		}
 	}
-
-	option = {
-		name = OK
-	}
 }
 
 # Homosexual Female (Guest 2)
@@ -3080,6 +3052,10 @@ character_event = {
 			modifier = opinion_feast_scandal
 			who = FROM
 		}
+		opinion = {
+			modifier = opinion_feast_scandal
+			who = FROMFROM
+		}
 	}
 	option = {
 		name = EVTOPTB_TOG_670
@@ -3091,6 +3067,10 @@ character_event = {
 			modifier = opinion_homosexual_sympathy
 			who = FROM
 		}
+		opinion = {
+			modifier = opinion_homosexual_sympathy
+			who = FROMFROM
+		}
 	}
 }
 
@@ -3511,7 +3491,6 @@ character_event = {
 		clr_character_flag = feast_lunatic
 		clr_character_flag = feast_lustful
 		clr_character_flag = feast_homosexual
-		clr_character_flag = feast_drunkard
 		clr_character_flag = feast_friendship
 		clr_character_flag = do_not_disturb
 	}

diff --git a/MOD/Witcher/events/oldgods_culture_conversion.txt b/MOD/Witcher/events/oldgods_culture_conversion.txt
@@ -18,4 +18,3 @@ namespace = TOG
 # Province adopts Norman culture
 
 # Provinces can now flip to Norse culture
-
diff --git a/MOD/Witcher/events/oldgods_holmgang_events.txt b/MOD/Witcher/events/oldgods_holmgang_events.txt
@@ -75,7 +75,7 @@ character_event = {
 		}
 		modifier = {
 			factor = 0.6
-			trait = strong
+			is_strong_trigger = yes
 		}
 		modifier = {
 			factor = 0.6
@@ -122,10 +122,6 @@ character_event = {
 		set_character_flag = do_not_disturb
 		hidden_tooltip = { character_event = { id = TOG.5999 days = 50 } } # Safety catch flag clearing
 	}			
-
-	option = {
-		name = OK
-	}
 }
 
 # Fellow Vassal Hates You (Invisible)
@@ -199,7 +195,7 @@ character_event = {
 		}
 		modifier = {
 			factor = 0.6
-			trait = strong
+			is_strong_trigger = yes
 		}
 		modifier = {
 			factor = 0.6
@@ -272,10 +268,6 @@ character_event = {
 		set_character_flag = do_not_disturb
 		hidden_tooltip = { character_event = { id = TOG.5999 days = 50 } } # Safety catch flag clearing
 	}				
-
-	option = {
-		name = OK
-	}
 }
 
 # Your Vassal Hates You (Invisible)
@@ -344,7 +336,7 @@ character_event = {
 		}
 		modifier = {
 			factor = 0.6
-			trait = strong
+			is_strong_trigger = yes
 		}
 		modifier = {
 			factor = 0.6
@@ -412,10 +404,6 @@ character_event = {
 		set_character_flag = do_not_disturb
 		hidden_tooltip = { character_event = { id = TOG.5999 days = 50 } } # Safety catch flag clearing
 	}	
-
-	option = {
-		name = OK
-	}
 }
 
 # The challenge is issued
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,4 +18,3 @@ namespace = TOG
		# Province adopts Norman culture

		# Provinces can now flip to Norse culture