improvements to forsaken 9002 and 1001

Warcraft-GoA-Development-Team · Dec 21, 2023 · 79402db · 79402db
1 parent d944216
commit 79402db
Show file tree

Hide file tree

Showing 6 changed files with 82 additions and 19 deletions.
diff --git a/common/deathreasons/wc_event_deaths.txt b/common/deathreasons/wc_event_deaths.txt
@@ -6,4 +6,8 @@ death_wandering_isle = {
 }
 death_plague = { 
 	icon = "death_disease.dds"
+}
+
+death_arcane_explosion = { 
+	icon = "death_natural.dds"
 }
diff --git a/common/on_action/wc_lordaeron_on_actions.txt b/common/on_action/wc_lordaeron_on_actions.txt
@@ -33,7 +33,7 @@ random_yearly_playable_pulse = {
 		10 = forsaken.9001
 		10 = forsaken.9002
 		10 = forsaken.9003
-		10 = forsaken.9004
+		#10 = forsaken.9004
 	}
 
 }
diff --git a/events/wc_events/wc_lordaeron_events.txt b/events/wc_events/wc_lordaeron_events.txt
@@ -117,7 +117,10 @@ forsaken.1001 = {
 		first_valid = { # completely different perspective based on whether Lordaeron is still held by the story owner
 			triggered_desc = { 
 				trigger = { 
-					NOT = { title:b_lordaeron.holder = { any_liege_or_above = { this = scope:story.story_owner } } }
+					NOR = { 
+						title:b_lordaeron.holder = { any_liege_or_above = { this = scope:story.story_owner } } 
+						title:b_lordaeron.holder = scope:story.story_owner 
+					}
 				}
 				desc = forsaken.1001.desc.independent
 			}
@@ -154,8 +157,7 @@ forsaken.1001 = {
 			var:develop_the_undercity ?= flag:ready
 		}
 	}
-
-	#TODO: use a story cycle to handle complex fails such as sylvanas_character deaths
+
 	on_trigger_fail = { 
 		title:b_lordaeron.holder = { 
 			if = { 
@@ -173,7 +175,12 @@ forsaken.1001 = {
 			text = {
 				first_valid = {
 					triggered_desc = {
-						trigger = { NOT = { title:b_lordaeron.holder = { any_liege_or_above = { this = scope:story.story_owner } } } }
+						trigger = {
+							NOR = { 
+								title:b_lordaeron.holder = { any_liege_or_above = { this = scope:story.story_owner } } 
+								title:b_lordaeron.holder = scope:story.story_owner 
+							}
+						 }
 						desc = forsaken.1001.opt.a.independent
 					}
 					desc = forsaken.1001.opt.a.owned
@@ -1112,23 +1119,66 @@ forsaken.9002 = {
 		random_list = { 
 			50 = { 
 				trigger = { scope:new_character.faith = faith:echo_of_life }
-				add_character_modifier = { 
-					modifier = wc_arcanist_educated_casters
-					years = 2
+
+				send_interface_toast = {
+					title = forsaken.9002.education_successful
+					left_icon = root
+					custom_tooltip = forsaken.9002.education_successful_tt
+					add_character_modifier = { 
+						modifier = wc_arcanist_educated_casters
+						years = 2
+					}
 				}
 			}
 			50 = { 
 				trigger = { scope:new_character.faith = faith:alchemical_materialism }
-				add_character_modifier = { 
-					modifier = wc_alchemist_altered_troops
-					years = 2
+
+				send_interface_toast = {
+					title = forsaken.9002.alterations_successful
+					left_icon = root
+					custom_tooltip = forsaken.9002.alterations_successful_tt
+
+					add_character_modifier = { 
+						modifier = wc_alchemist_altered_troops
+						years = 2
+					}
 				}
 			}
 			50 = { 
-				random_knight = { 
-					limit = { NOT = { exists = primary_title } }
-					death = {
-						death_reason = death_poison
+				trigger = { scope:new_character.faith = faith:echo_of_life }
+				send_interface_toast = {
+					title = forsaken.9002.education_failed
+					left_icon = root
+					custom_tooltip = forsaken.9002.education_failed_tt
+					random_knight = { 
+						limit = { NOT = { exists = primary_title } }
+						death = {
+							death_reason = death_arcane_explosion 
+						}
+					}
+					scope:new_character = {
+						death = {
+							death_reason = death_arcane_explosion 
+						}
+					}
+				}
+			}
+			50 = { 
+				trigger = { scope:new_character.faith = faith:alchemical_materialism }
+				send_interface_toast = {
+					title = forsaken.9002.alterations_failed
+					left_icon = root
+					custom_tooltip = forsaken.9002.alterations_failed_tt
+					random_knight = { 
+						limit = { NOT = { exists = primary_title } }
+						death = {
+							death_reason = death_poison
+						}
+					}
+					scope:new_character = {
+						death = {
+							death_reason = death_poison
+						}
 					}
 				}
 			}

diff --git a/localization/english/event_localization/wc_lordaeron_events_l_english.yml b/localization/english/event_localization/wc_lordaeron_events_l_english.yml
@@ -81,9 +81,17 @@ forsaken.9001.opt.c:0 "Your talent has granted you a second chance. Come work fo
 forsaken.9001.opt.d:0 "You live by my will alone, now go and do my bidding..."
 
 forsaken.9002.title:0 "An Offer We Could Refuse"
-forsaken.9002.desc.echoseeker:0 "My councilors have alterted me to an offer from an Arcanist of some repute. This $echo_of_life_adherent$ claims to have the ability to teach our casters powerful experimental spells, in exchange for a small fee and temporary access to some of our restricted arcane texts. We could accept this offer, but it is well known that Arcane magic carries inherent risks and the $echo_of_life_adherent_plural$ are known for carelessness in their pursuits. Another solution would be to have this mage make more traditional enchantments and magical enhancements to our troops' armor. The choice is mine as to how to proceed."
-forsaken.9002.desc.alchemist:0 "My councilors have alterted me to an offer from an Alchemist of some repute. This follower of $alchemical_materialism$ claims to have the ability to enhance our knights with powerful experimental potions, in exchange for a small fee and temporary access to some of our restricted alchemical facilities.\n\n We could accept this offer, but it is well known that such alchemical applications carry inherent risks and the $alchemical_materialism_adherent_plural$ are known for their callous experimentation and disregard for their subjects' well being. Another solution would be to have this Alchemist make more traditional potions and magical enhancements to our troops' armor. The choice is mine as to how to proceed."
+forsaken.9002.desc.echoseeker:0 "My councilors have alterted me to an offer from an arcanist of some repute. This $echo_of_life_adherent$ claims to have the ability to teach our casters powerful experimental spells, in exchange for a small fee and temporary access to some of our restricted arcane texts. We could accept this offer, but it is well known that Arcane magic carries inherent risks and the $echo_of_life_adherent_plural$ are known for carelessness in their pursuits. Another solution would be to have this mage make more traditional enchantments and magical enhancements to our troops' armor. The choice is mine as to how to proceed."
+forsaken.9002.desc.alchemist:0 "My councilors have alterted me to an offer from an alchemist of some repute. This follower of $alchemical_materialism$ claims to have the ability to enhance our knights with powerful experimental potions, in exchange for a small fee and temporary access to some of our restricted alchemical facilities.\n\n We could accept this offer, but it is well known that such alchemical applications carry inherent risks and the $alchemical_materialism_adherent_plural$ are known for their callous experimentation and disregard for their subjects' well being. Another solution would be to have this alchemist make more traditional potions and magical enhancements to our troops' armor. The choice is mine as to how to proceed."
 forsaken.9002.opt.a:0 "We'll accept the risks. Commence the experiments!"
+forsaken.9002.education_successful:0 "Arcane Education"
+forsaken.9002.education_successful_tt:0 "Casters were educated in experimental spellcraft"
+forsaken.9002.alteration_successful:0 "Alchemical Alteration"
+forsaken.9002.alteration_successful_tt:0 "Knights and Giants were enhanced successfully"
+forsaken.9002.education_failed:0 "Arcane Explosion"
+forsaken.9002.education_failed_tt:0 "Arcane education ended in tragedy"
+forsaken.9002.alteration_failed:0 "Alchemical Accident"
+forsaken.9002.alteration_failed_tt:0 "Alchemical alteration ended tragically"
 forsaken.9002.opt.b:0 "Let us go with a more conventional option."
 forsaken.9002.opt.c:0 "Get this heretic out of my sight!"
 

diff --git a/localization/english/modifiers/wc_modifiers_l_english.yml b/localization/english/modifiers/wc_modifiers_l_english.yml
@@ -244,7 +244,7 @@
  wc_executed_religious_minority_modifier_desc:0 "This character is known for mercilessly persecuting religious minorities."
 
  wc_arcanist_educated_casters:0 "Arcane Educated Casters"
- wc_alchemist_altered_troops:0 "Alchemically Atered Troops"
+ wc_alchemist_altered_troops:0 "Alchemically Altered Troops"
  wc_arcanist_equipped_troops:0 "Enchantment-Armored Troops"
  wc_alchemist_equipped_troops:0 "Potion-Equipped Troops"
 

diff --git a/localization/english/wc_death_reasons_l_english.yml b/localization/english/wc_death_reasons_l_english.yml
@@ -6,4 +6,5 @@
  death_wandering_isle_killer:0 "banished to the Wandering Isle by [TARGET_CHARACTER.GetUIName]"
 
  death_plague:0 "died of [Scourge|E] Plague"
-
+
+ death_arcane_explosion:0 "died in a freak and uncontrolled Arcane Explosion"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,4 +6,5 @@
		death_wandering_isle_killer:0 "banished to the Wandering Isle by [TARGET_CHARACTER.GetUIName]"

		death_plague:0 "died of [Scourge\|E] Plague"


		death_arcane_explosion:0 "died in a freak and uncontrolled Arcane Explosion"