Skip to content

Commit

Permalink
fix some errors
Browse files Browse the repository at this point in the history
  • Loading branch information
@edmund-h
edmund-h committed Dec 19, 2023
1 parent ae59323 commit 220ae54
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 31 deletions.
9 changes: 6 additions & 3 deletions common/story_cycles/wc_story_cycle_forsaken_origin.txt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
story_cycle_forsaken_origins = {
on_setup = {
#possibly make it so that only one person can ever get this story cycle
scope:story_owner = {
story_owner = {
if = {
limit = {
exists = top_liege
Expand All @@ -10,8 +10,11 @@
}
}
set_global_variable = { name = sylvanas_character value = top_liege }
scope:top_liege = {
trigger_event = forsaken.1000
top_liege = {
trigger_event = {
id = forsaken.1000
days = 7
}
}
}
else = {
Expand Down
43 changes: 24 additions & 19 deletions events/wc_events/wc_lordaeron_events.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,23 +50,23 @@ forsaken.1000 = {
scope:current_owner = {
send_interface_toast = {
title = forsaken.1000.manage_construction_title
left_icon = root
left_icon = current_owner
custom_tooltip = forsaken.1000.manage_construction_tt
add_gold = 250
progress_towards_rival_effect = {
CHARACTER = root
OPINION = -15
REASON = forsaken.1000.manage_construction_tt
}
}
}
progress_towards_rivalry_effect = {
CHARACTER = current_owner
OPINION = -15
REASON = forsaken.1000.manage_construction_tt
}
remove_short_term_gold = 250
}

# approve - let vassal deal with it
option = {
name = forsaken.1000.opt.b
scope:current_owner = {
scope:current_owner = {
send_interface_toast = {
title = forsaken.1000.approve_title
left_icon = root
Expand All @@ -88,7 +88,7 @@ forsaken.1000 = {
title = forsaken.1000.disapprove_title
left_icon = root
custom_tooltip = forsaken.1000.disapprove_tt
progress_towards_rivalry_effect = {
progress_towards_rival_effect = {
CHARACTER = root
OPINION = -25
REASON = forsaken.1000.disapprove_tt
Expand Down Expand Up @@ -917,7 +917,7 @@ forsaken.9001 = {

#execute them
option = {
name = lordaeron.9000.opt.e
name = forsaken.9001.opt.e
show_as_tooltip = {
execute_prisoner_effect = {
VICTIM = scope:new_character
Expand All @@ -933,7 +933,7 @@ forsaken.9001 = {

#imprison them
option = {
name = lordaeron.9000.opt.a
name = forsaken.9001.opt.a
imprison_character_effect = {
TARGET = scope:new_character
IMPRISONER = root
Expand All @@ -942,7 +942,7 @@ forsaken.9001 = {

#fine them
option = {
name = lordaeron.9000.opt.b
name = forsaken.9001.opt.b
trigger = {
NOT = { scope:new_character.faith = faith:forsaken_cult}
stewardship >= decent_skill_rating
Expand All @@ -960,7 +960,7 @@ forsaken.9001 = {

#invite them to court and get hook
option = {
name = lordaeron.9000.opt.c
name = forsaken.9001.opt.c
trigger = { NOT = { scope:new_character.faith = faith:forsaken_cult}}
scope:new_character = {
progress_towards_friend_effect = {
Expand All @@ -977,7 +977,7 @@ forsaken.9001 = {

#give them passage to Dalaran and get hook
option = {
name = lordaeron.9000.opt.d
name = forsaken.9001.opt.d
trigger = { learning >= decent_skill_rating }
add_hook = {
target = scope:new_character
Expand Down Expand Up @@ -1059,7 +1059,7 @@ forsaken.9002 = {
set_character_faith = faith:echo_of_life
}
50 = {
if = {
if = {
limit = {
NOT = {
title:b_lordaeron = {
Expand All @@ -1078,8 +1078,8 @@ forsaken.9002 = {

# yes, let them alter our troops
option = {
desc = forsaken.9002.opt.a
random = {
name = forsaken.9002.opt.a
random_list = {
50 = {
trigger = { scope:new_character.faith = faith:echo_of_life }
add_character_modifier = {
Expand All @@ -1095,14 +1095,19 @@ forsaken.9002 = {
}
}
50 = {
random_knight = { death = yes }
random_knight = {
override_death_effect = {
killer = new_character
death_reason = death_poison
}
}
}
}
}

# no, pursue a safer option
option = {
desc = forsaken.9002.opt.b
name = forsaken.9002.opt.b
if = {
limit = { scope:new_character.faith = faith:alchemical_materialism }
add_character_modifier = {
Expand All @@ -1121,6 +1126,6 @@ forsaken.9002 = {

# reject their help
option = {
desc = forsaken.9002.opt.c
name = forsaken.9002.opt.c
}
}
25 changes: 16 additions & 9 deletions localization/english/event_localization/wc_lordaeron_events_l_english.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
forsaken.1000.desc:0 "My vassal has begun construction of a vast fortress in the sewers beneath the ruins of Lordaeron, known as the Undercity. My councilors assure me that this will secure the position of the Forsaken in the region forever. However, I must also contend with the fact that this impregnable position becomes theirs to control and not my own. Perhaps it would be a wise decision to reimburse them for the costs and gain some control over the construction of this monumental task."
forsaken.1000.opt.a:0 "It is time to assert our control."
forsaken.1000.manage_construction_title:0 "Liege Assumes Control"
forsaken.1000.manage_construction_tt:0 "[ROOT.Char.GetTitledFirstName] has reimbursed construction costs and assumed control over construction of the Undercity."
forsaken.1000.manage_construction_tt:0 "Liege has reimbursed construction costs and assumed control over construction of the Undercity."
forsaken.1000.opt.b:0 "There is no need, they seem capable enough."
forsaken.1000.approve_title:0 "Top Liege Approves"
forsaken.1000.approve_tt:0 "Undercity construction has [ROOT.Char.Custom2('GetTitledFirstNamePossessiveOrMy', ROOT.Char)] approval."
forsaken.1000.approve_tt:0 "Undercity construction has Liege approval."
forsaken.1000.opt.c:0 "How dare they start this project without my permission!"
forsaken.1000.approve_title:0 "Top Liege Does Not Approve"
forsaken.1000.disapprove_tt:0 "Undercity construction resulted in [ROOT.Char.Custom2('GetTitledFirstNamePossessiveOrMy', ROOT.Char)] rebuke."
forsaken.1000.disapprove_title:0 "Top Liege Does Not Approve"
forsaken.1000.disapprove_tt:0 "Undercity construction resulted in rebuke from Liege."


forsaken.1001.title:0 "The Undercity Rebuilt"
Expand Down Expand Up @@ -74,8 +74,15 @@ forsaken.9001.desc.echoseeker:0 "Our archivists caught a suspicious individual l
forsaken.9001.desc.alchemist:0 "Our apothecaries caught a suspicious individual leaving our experimentation chambers with classified alchemical reagents and recipes. Apparently the individual is one of a small sect of liberated undead who reject all divinity known as "$alchemical_materialism_adherent_plural$". These individuals are not known to proselytize actively but often engage in risky and dangerous alchemical practices. As this individual stands before me I can not ignore a hint of malice behind the glimmering intellect of a crafty and talented alchemist.\n\nOn one hand, I can deal justice to this individual as I see fit since they are a convicted thief. On the other, they might make a useful courtier or a potent spy if I can tolerate their cynical beliefs."
forsaken.9001.desc.forgotten:0 "Our archivists caught a suspicious individual leaving our library sanctum with copies of classified documents relating to the teachings of Natalie Seline. Apparently the individual is one of these followers of "Forgotten Shadow" who emerged following our excavation of the Undercity. While they are frequently charitable and often noble individuals, their continued proselytization has been known to upset the established order of our land. As this individual stands before me I can see no hint of malice, nor can I ignore the glimmering intellect of a learned priest.\n\nOn one hand, I can deal justice to this individual as I see fit since they are a convicted thief. On the other, they might make a useful courtier or a potent spy if I can tolerate their misguided beliefs."
forsaken.9001.desc.forsaken:0 "Our apothecaries caught a suspicious individual leaving our experimentation chambers with classified alchemical reagents and recipes. Apparently the individual is one of these "$forsaken_cult_adherent_plural" who still follow the old, autocratic ways. These individuals are known to proselytize actively and often engage in risky and dangerous alchemical practices. As this admittedly talented individual stands before me, I can not ignore the danger they represent to the fledgeling order of the land.\n\nOn one hand, I can deal justice to this individual as I see fit since they are a convicted thief. On the other, while too dangerous to be allowed to remain in the realm, they may prove a potent spy."
lordaeron.9000.opt.e:0 "Execute this insolent fool."
lordaeron.9000.opt.a:0 "Throw the pitiful sod in jail."
lordaeron.9000.opt.b:0 "Fine and release the thief to curry favor with those gone astray."
lordaeron.9000.opt.c:0 "Your talent has granted you a second chance. Come work for me."
lordaeron.9000.opt.d:0 "You live by my will alone, now go and do my bidding..."
forsaken.9001.opt.e:0 "Execute this insolent fool."
forsaken.9001.opt.a:0 "Throw the pitiful sod in jail."
forsaken.9001.opt.b:0 "Fine and release the thief to curry favor with those gone astray."
forsaken.9001.opt.c:0 "Your talent has granted you a second chance. Come work for me."
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.9001.desc.alchemist:0 "My councilors have alterted me to an offer from an Alchemist of some repute. This $alchemical_materialism_adherent$ 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. 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 experimentats and disregard for their subjects' well being. 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.opt.a:0 "We'll accept the risks. Commece the experiments!"
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!"

0 comments on commit 220ae54

Please sign in to comment.