make sure sylvanas char = story owner

Warcraft-GoA-Development-Team · Dec 20, 2023 · fa57e78 · fa57e78
1 parent 220ae54
commit fa57e78
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 35 deletions.
diff --git a/common/story_cycles/wc_story_cycle_forsaken_origin.txt b/common/story_cycles/wc_story_cycle_forsaken_origin.txt
@@ -5,21 +5,15 @@
 			if = { 
 				limit = { 
 					exists = top_liege
-					top_liege = { 
-						is_of_forsaken_like_culture = yes
-					}
 				}
-				set_global_variable = { name = sylvanas_character value = top_liege }
 				top_liege = {
 					trigger_event = { 
 						id = forsaken.1000
 						days = 7 
 					}
 				}
 			} 
-			else = { 
-				set_global_variable = { name = sylvanas_character value = root }
-			}
+			set_global_variable = { name = sylvanas_character value = root }
 		}
 	}
 

diff --git a/events/wc_events/wc_lordaeron_events.txt b/events/wc_events/wc_lordaeron_events.txt
@@ -41,8 +41,15 @@ forsaken.1000 = {
 		}
 	}
 
-	# take over the story
+	# take over the story (player only)
 	option = {
+		trigger = { 
+			is_ai = no 
+			piety_level >= 2
+			prestige_level >= 2 
+			is_of_forsaken_like_culture = yes
+		}
+
 		name = forsaken.1000.opt.a
 		scope:story = { 
 			make_story_owner = root
@@ -58,6 +65,7 @@ forsaken.1000 = {
 					OPINION = -15
 					REASON = forsaken.1000.manage_construction_tt
 				}
+				set_global_variable = { name = sylvanas_character value = root }
 			}
 		}
 		remove_short_term_gold = 250
@@ -323,6 +331,10 @@ forsaken.1100 = {
 	override_background = wc_undercity_throne_room
 
 	immediate = {
+		root = { 
+			save_scope_as = selenite_decider
+		}
+
 		every_vassal_or_below = {
 			limit = {
 				faith.religion = { is_in_family = rf_shadow }
@@ -625,11 +637,11 @@ forsaken.1103 = {
 	desc = { 
 		first_valid = { 
 			triggered_desc = { 
-				trigger = { scope:story.story_owner = { var:selinite_decision = flag:subsumed } }
+				trigger = { scope:selenite_decider = { var:selinite_decision = flag:subsumed } }
 				desc = forsaken.1103.desc.subsumed
 			} 
 			triggered_desc = { 
-				trigger = { scope:story.story_owner = { var:selinite_decision = flag:embraced } }
+				trigger = { scope:selenite_decider = { var:selinite_decision = flag:embraced } }
 				desc = forsaken.1103.desc.embraced
 			}
 			desc = forsaken.1103.desc.tolerated
@@ -660,21 +672,21 @@ forsaken.1103 = {
 
 		if = { 
 			limit = { 
-				scope:story.story_owner = { var:selinite_decision = flag:subsumed } 
-			 	any_liege_or_above = { this = scope:story.story_owner } 
+				scope:selenite_decider = { var:selinite_decision = flag:subsumed } 
+			 	any_liege_or_above = { this = scope:selenite_decider } 
 			} 
 			progress_towards_friend_effect = {
-				CHARACTER = scope:story.story_owner
+				CHARACTER = scope:selenite_decider
 				OPINION = 50
 				REASON = forsaken.1103.obeyed
 			}
 		} 
 		else_if = { 
-			limit = { scope:story.story_owner = { var:selinite_decision = flag:embraced } }
+			limit = { scope:selenite_decider = { var:selinite_decision = flag:embraced } }
 			if = { 
-				limit = { any_liege_or_above = { this = scope:story.story_owner } } 
+				limit = { any_liege_or_above = { this = scope:selenite_decider } } 
 				progress_towards_rival_effect = {
-					CHARACTER = scope:story.story_owner
+					CHARACTER = scope:selenite_decider
 					OPINION = -50
 					REASON = forsaken.1103.disobeyed
 				}
@@ -685,12 +697,12 @@ forsaken.1103 = {
 		} 
 		else_if = { 
 			limit = { 
-				scope:story.story_owner = { var:selinite_decision = flag:tolerated } 
+				scope:selenite_decider = { var:selinite_decision = flag:tolerated } 
 			} 
 			if = { 
-				limit = { any_liege_or_above = { this = scope:story.story_owner } }
+				limit = { any_liege_or_above = { this = scope:selenite_decider } }
 				progress_towards_rival_effect = {
-					CHARACTER = scope:story.story_owner
+					CHARACTER = scope:selenite_decider
 					OPINION = -20
 					REASON = forsaken.1103.disobeyed
 				}
@@ -719,22 +731,22 @@ forsaken.1103 = {
 		}
 		if = { 
 			limit = { 
-				scope:story.story_owner = { var:selinite_decision = flag:embraced }
-				any_liege_or_above = { this = scope:story.story_owner } 
+				scope:selenite_decider = { var:selinite_decision = flag:embraced }
+				any_liege_or_above = { this = scope:selenite_decider } 
 			} 
 			progress_towards_friend_effect = {
-				CHARACTER = scope:story.story_owner
+				CHARACTER = scope:selenite_decider
 				OPINION = 50
 				REASON = forsaken.1103.obeyed
 			}
 
 		} 
 		else_if = { 
-			limit = { scope:story.story_owner = { var:selinite_decision = flag:subsumed } }
+			limit = { scope:selenite_decider = { var:selinite_decision = flag:subsumed } }
 			if = { 
-				limit = { any_liege_or_above = { this = scope:story.story_owner } } 
+				limit = { any_liege_or_above = { this = scope:selenite_decider } } 
 				progress_towards_rival_effect = {
-					CHARACTER = scope:story.story_owner
+					CHARACTER = scope:selenite_decider
 					OPINION = -50
 					REASON = forsaken.1103.disobeyed
 				}
@@ -745,8 +757,8 @@ forsaken.1103 = {
 		} 
 		else_if = { 
 			limit = { 
-				scope:story.story_owner = { var:selinite_decision = flag:tolerated } 
-				NOT = { any_liege_or_above = { this = scope:story.story_owner } }
+				scope:selenite_decider = { var:selinite_decision = flag:tolerated } 
+				NOT = { any_liege_or_above = { this = scope:selenite_decider } }
 			}
 			add_character_modifier = wc_forsaken_embraced_selinite_modifier
 		}
@@ -757,21 +769,21 @@ forsaken.1103 = {
 
 		if = { 
 			limit = { 
-				scope:story.story_owner = { var:selinite_decision = flag:tolerated } 
-				any_liege_or_above = { this = scope:story.story_owner } 
+				scope:selenite_decider = { var:selinite_decision = flag:tolerated } 
+				any_liege_or_above = { this = scope:selenite_decider } 
 			}
 			progress_towards_friend_effect = {
-				CHARACTER = scope:story.story_owner
+				CHARACTER = scope:selenite_decider
 				OPINION = 50
 				REASON = forsaken.1103.obeyed
 			}
 		} 
 		else_if = { 
-			limit = { scope:story.story_owner = { var:selinite_decision = flag:subsumed } } 
+			limit = { scope:selenite_decider = { var:selinite_decision = flag:subsumed } } 
 			if = { 
-				limit = { any_liege_or_above = { this = scope:story.story_owner } } 
+				limit = { any_liege_or_above = { this = scope:selenite_decider } } 
 				progress_towards_rival_effect = {
-					CHARACTER = scope:story.story_owner
+					CHARACTER = scope:selenite_decider
 					OPINION = -20
 					REASON = forsaken.1103.disobeyed
 				}
@@ -780,8 +792,8 @@ forsaken.1103 = {
 		} 
 		else_if = { 
 			limit = { 
-				scope:story.story_owner = { var:selinite_decision = flag:embraced } 
-				NOT = { any_liege_or_above = { this = scope:story.story_owner } }
+				scope:selenite_decider = { var:selinite_decision = flag:embraced } 
+				NOT = { any_liege_or_above = { this = scope:selenite_decider } }
 			} 
 			add_character_modifier =  wc_forsaken_tolerated_selinite_modifier
 		}