From 317dcfdf02064b4c9b09bf1662e0491a5c408eaf Mon Sep 17 00:00:00 2001 From: name Date: Wed, 20 Dec 2023 13:05:26 -0500 Subject: [PATCH 01/12] branch This reverts commit afca855bf0d8a485819f41eea2e951cbf80f0e0f. --- common/on_action/death.txt | 1 + .../wc_arthas_expedition_values.txt | 9 + .../wc_arthas_expedition_effects.txt | 10 +- .../wc_arthas_expedition_events.txt | 78 +++- events/wc_events/wc_uther_events.txt | 349 +++++++++++++++++- .../wc_arthas_expedition_events_l_english.yml | 1 + .../english/wc_uther_events_l_english.yml | 27 +- 7 files changed, 459 insertions(+), 16 deletions(-) diff --git a/common/on_action/death.txt b/common/on_action/death.txt index bb12e02be8..61b4f652c1 100644 --- a/common/on_action/death.txt +++ b/common/on_action/death.txt @@ -200,6 +200,7 @@ on_death = { scope:killer = { save_scope_as = arthas } trigger_event = { id = uther_events.001 + days = 3 } } # Terenas Funeral diff --git a/common/script_values/wc_arthas_expedition_values.txt b/common/script_values/wc_arthas_expedition_values.txt index 0edf162d02..f7054fe746 100644 --- a/common/script_values/wc_arthas_expedition_values.txt +++ b/common/script_values/wc_arthas_expedition_values.txt @@ -97,6 +97,15 @@ find_uther_value = { limit = { has_trait = temperate } add = 10 } + + if = { + limit = { exists = character:60036 this = character:60036 } + add = 100 + } + if = { + limit = { is_landed = yes } + add = 20 + } } find_jaina_value = { value = 0.001 diff --git a/common/scripted_effects/wc_arthas_expedition_effects.txt b/common/scripted_effects/wc_arthas_expedition_effects.txt index d8d0f87d43..38e51c7416 100644 --- a/common/scripted_effects/wc_arthas_expedition_effects.txt +++ b/common/scripted_effects/wc_arthas_expedition_effects.txt @@ -17,21 +17,23 @@ set_global_variable = { name = arthas_character value = this } } } + find_uther_effect = { every_courtier = { add_to_temporary_list = valid_uthers } every_vassal = { add_to_temporary_list = valid_uthers } top_liege = { every_courtier = { add_to_temporary_list = valid_uthers } every_vassal = { add_to_temporary_list = valid_uthers } + every_vassal = { every_vassal = { add_to_temporary_list = valid_uthers } } + every_vassal = { every_vassal = { every_vassal = { add_to_temporary_list = valid_uthers } } } } faith = { every_faith_holy_order = { leader = { add_to_temporary_list = valid_uthers } } } + every_player = { add_to_temporary_list = valid_uthers } ordered_in_list = { - limit = { - is_ai = yes - - can_be_invited_in_arthas_expedition_trigger = { INVITER = scope:host } + limit = { # Uther wont be invited with the normal trigger + is_available_for_activity_trigger = yes } list = valid_uthers order_by = find_uther_value diff --git a/events/activities/arthas_expedition_activity/wc_arthas_expedition_events.txt b/events/activities/arthas_expedition_activity/wc_arthas_expedition_events.txt index fd230a0575..86e90c2c6a 100644 --- a/events/activities/arthas_expedition_activity/wc_arthas_expedition_events.txt +++ b/events/activities/arthas_expedition_activity/wc_arthas_expedition_events.txt @@ -56,9 +56,9 @@ wc_arthas_story.10 = { immediate = { if = { limit = { root = scope:host } - find_uther_effect = yes find_jaina_effect = yes + scope:uther = { if = { limit = { is_commanding_army = yes } @@ -124,6 +124,7 @@ wc_arthas_story.10 = { name = wc_arthas_story_10_OPT_arthas } } + # Everything around looks dead, you find an abandoned farm, is attacked by undead inside, briefly see Kel'Thuzad wc_arthas_story.15 = { type = activity_event @@ -298,6 +299,7 @@ wc_arthas_story.30 = { NOT = { root = scope:host } } } + on_trigger_fail = { # Stops the event chain if = { @@ -398,11 +400,11 @@ wc_arthas_story.30 = { if = { limit = { root = scope:host } share_event_with_group_delay_effect = { ID = wc_arthas_story.35 DAYS = 1 } - trigger_event = { id = wc_arthas_story.40 days = @stratholme_delay } } } } -# Arthas tells you about his decision (it depends on Arthas' decision above) + +# Arthas tells you about his decision (it depends on Arthas' decision above & Uther's interference) wc_arthas_story.35 = { type = activity_event title = { @@ -480,6 +482,7 @@ wc_arthas_story.35 = { purge_event_modifier = yes } + } # Stay (evacuate) option = { @@ -521,10 +524,18 @@ wc_arthas_story.35 = { } } trigger = { - NAND = { - scope:activity = { has_variable = jaina } - scope:activity.var:jaina = { is_alive = yes } - root = scope:activity.var:jaina + NOR = { + AND = { + scope:activity = { has_variable = uther } + root = scope:activity.var:uther + scope:activity.var:uther = { is_alive = yes } + scope:activity.var:uther = { is_ai = yes } + } + AND = { + scope:activity = { has_variable = jaina } + scope:activity.var:jaina = { is_alive = yes } + root = scope:activity.var:jaina + } } } @@ -540,6 +551,39 @@ wc_arthas_story.35 = { } } } + # Uther's Reaction, might leave + option = { + name = wc_arthas_story_35_OPT_B_purge_uther + + trigger = { + trigger = { scope:stratholme_action = flag:purge } + scope:activity = { has_variable = uther } + scope:activity.var:uther = { is_alive = yes } + root = scope:activity.var:uther + scope:activity.var:uther = { is_ai = no } # no ai + scope:activity.var:uther = { is_uther_trigger = yes } #real uther + } + + + scope:activity.var:uther = { + add_character_flag = uther_decision + trigger_event = { + id = uther_events.002 + } + } + + custom_tooltip = uther_tooltip + + ai_chance = { + base = 15 + + leave_event_modifier = yes + modifier = { + scope:activity.var:uther ?= root + add = 5 + } + } + } # Leave - Jaina option = { name = { @@ -580,6 +624,26 @@ wc_arthas_story.35 = { } } } + after = { + if = { + limit = { scope:activity.var:uther = { + has_character_flag = uther_decision + } } + #wait for uther decision + trigger_event = { + id = wc_arthas_story.40 + days = 10 + } + current_travel_plan = { + delay_travel_plan = { days = 10 } + } + } + else = { + # continue like normal + trigger_event = { id = wc_arthas_story.40 days = 3 } + } + } + } # Arthas does what he wanted with the city (it depends on Arthas' decision above) wc_arthas_story.40 = { diff --git a/events/wc_events/wc_uther_events.txt b/events/wc_events/wc_uther_events.txt index 3c80f17e43..91a8bfb9cb 100644 --- a/events/wc_events/wc_uther_events.txt +++ b/events/wc_events/wc_uther_events.txt @@ -5,9 +5,11 @@ uther_events.001 = { title = uther_events.001.t desc = uther_events.001.d theme = dread - + override_background = { + reference = throne_room + } right_portrait = { - character = scope:uther + character = scope:uther animation = sadness } @@ -36,10 +38,12 @@ uther_events.001 = { # Anger at arthas option = { name = uther_events.001.b + set_relation_rival = { reason = rival_heresy target = scope:arthas } + add_trait = depressed_1 hidden_effect = { @@ -52,13 +56,350 @@ uther_events.001 = { # Protect lordaeron option = { name = uther_events.001.c + trigger = { + NOT = { has_trait = being_undead } + } + if = { + limit = { NOT = { faith = faith:scarlet } } + set_character_faith = faith:scarlet + } + add_trait = zealous - set_character_faith = faith:scarlet - + add_prowess_skill = 5 + hidden_effect = { stress_impact = { base = 150 } } } +} + +# The Culling +uther_events.002 = { + title = uther_events.002.t + desc = uther_events.002.d + theme = plague + override_background = { + reference = wc_stratholme + } + + left_portrait = { + character = root + animation = disbelief + } + right_portrait = { + character = scope:host + animation = personality_bold + } + + #just in case + trigger = { + is_uther_trigger = yes + } + + immediate = { + stress_impact = { + base = medium_stress_impact_gain + } + involved_activity = { + save_scope_as = activity + } + } + + # Leave + option = { + name = uther_events.002.a + # Continue as normal + scope:activity = { trigger_event = { id = wc_arthas_story.40 days = 3 } } + leave_arthas_expedition_event_effect = yes + } + + # Try and convince Arthas otherwise + option = { + name = uther_events.002.b + duel = { + target = scope:host + skills = { prowess intrigue } + value = decent_skill_rating + 50 = { + modifier = { #rng + add = { -10 10 } + is_alive = yes + } + # AI more likely to lose to keep to original story + modifier = { + add = { -15 0 } + is_ai = yes + } + modifier = { + add = { 5 10 } + is_ai = no + } + compare_modifier = { + value = scope:duel_value + multiplier = 3.5 + min = -49 + } + custom_tooltip = uther_win_tooltip + trigger_event = { + id = uther_events.003 + } + } + 50 = { #You lose + compare_modifier = { + value = scope:duel_value + multiplier = -3.5 + min = -49 + } + custom_tooltip = uther_lose_tooltip + trigger_event = { + id = uther_events.004 + } + } + } + } +} + +# Convince - Win +uther_events.003 = { + title = uther_events.003.t + desc = uther_events.003.d + theme = plague + + override_background = { + reference = wc_stratholme + } + + left_portrait = { + character = root + animation = thinking + } + right_portrait = { + character = scope:host + animation = personality_rational + } + + #just in case + trigger = { + is_uther_trigger = yes + } + + # Quarantine Instead + option = { + name = uther_events.003.a + save_scope_value_as = { name = stratholme_action value = flag:quarantine } + } + + # Evacuate instead + option = { + name = uther_events.003.b + save_scope_value_as = { name = stratholme_action value = flag:evacuate } + } + + # Arthas choice + option = { + name = uther_events.003.c + hidden_effect = { + random_list = { + 40 = { # he decides to quarantine + save_scope_value_as = { name = stratholme_action value = flag:quarantine } + send_interface_toast = { + title = arthas_decides_q + desc = arthas_decides_q_desc + left_icon = scope:arthas + right_icon = root + } + } + 40 = { # evac + save_scope_value_as = { name = stratholme_action value = flag:evacuate } + send_interface_toast = { + title = arthas_decides_e + desc = arthas_decides_e_desc + left_icon = scope:arthas + right_icon = root + } + } + 20 = { #betray + add_character_flag = arthas_betrayal + save_scope_value_as = { name = stratholme_action value = flag:purge } + } + } + } + } + + after = { + if = { + limit = { NOT = { var:stratholme_action = flag:purge } } + #notify group of change + share_event_with_group_delay_effect = { + ID = uther_events.035 + DAYS = 1 + } + } + } +} + +#Notif for group +uther_events.035 = { + title = uther_events.003.t + desc = { + desc = uther_events.035.d + triggered_desc = { + trigger = { var:stratholme_action = flag:quarantine } + desc = uther_events.035.d_q + } + triggered_desc = { + trigger = { var:stratholme_action = flag:evacuate } + desc = uther_events.035.d_e + } + } + + theme = plague + + trigger = { + NOT = { is_uther_trigger = yes } + } + + left_portrait = { + character = root + animation = happiness + } + + right_portrait = { + character = scope:arthas + animation = personality_bold + } + + lower_center_portrait = { + character = scope:activity.var:uther + animation = idle + } + + override_background = { + reference = wc_stratholme + } + + option = { + name = uther_events.035.a + } + + option = { # why would he consider doing that + name = uther_events.035.b + add_opinion = { + target = scope:arthas + modifier = disappointed_opinion + } + } + + after = { + remove_character_flag = uther_decision + # Continue as normal + scope:activity = { trigger_event = { id = wc_arthas_story.40 days = 3 } } + } +} + +# Convince - Fail +uther_events.004 = { + title = uther_events.003.t + desc = { + first_valid = { + triggered_desc = { + trigger = { has_character_flag = arthas_betrayal } + desc = uther_events.004.d_betrayal + } + } + desc = uther_events.004.d + } + theme = plague + + override_background = { + reference = wc_stratholme + } + + left_portrait = { + character = root + animation = sadness + } + right_portrait = { + character = scope:host + animation = anger + } + + #just in case + trigger = { + is_uther_trigger = yes + } + + immediate = { + #kick arthas out of silver hand + } + + # Oh well... + option = { + name = uther_events.004.a + + random_list = { + 40 = { + progress_towards_rival_effect = { + CHARACTER = scope:host + REASON = rival_purge_stratholme + OPINION = -15 + } + stress_impact = { + base = massive_stress_impact_gain + } + } + 40 = { + progress_towards_rival_effect = { + CHARACTER = scope:host + REASON = rival_purge_stratholme + OPINION = -30 + } + stress_impact = { + base = major_stress_impact_gain + } + } + 20 = { + add_trait = depressed_1 + stress_impact = { + base = medium_stress_impact_gain + } + } + } + leave_arthas_expedition_event_effect = yes + } + + # He must pay... + option = { + name = uther_events.004.b + + add_trait = vengeful + set_character_faith = faith:scarlet + + progress_towards_rival_effect = { + CHARACTER = scope:host + REASON = rival_purge_stratholme + OPINION = -40 + } + leave_arthas_expedition_event_effect = yes + } + + # decide to stay? + + option = { + name = uther_events.004.c + custom_tooltip = uther_stay_tooltip + } + + + after = { + if = { + limit = { has_character_flag = arthas_betrayal } + remove_character_flag = arthas_betrayal + } + remove_character_flag = uther_decision + # Continue as normal + scope:activity = { trigger_event = { id = wc_arthas_story.40 days = 3 } } + } } \ No newline at end of file diff --git a/localization/english/event_localization/wc_arthas_expedition_events_l_english.yml b/localization/english/event_localization/wc_arthas_expedition_events_l_english.yml index ed276ea40a..3d31f3cb0c 100644 --- a/localization/english/event_localization/wc_arthas_expedition_events_l_english.yml +++ b/localization/english/event_localization/wc_arthas_expedition_events_l_english.yml @@ -45,6 +45,7 @@ wc_arthas_story_35_OPT_A_purge:0 "It must be done." wc_arthas_story_35_OPT_A_evacuate:1 "[GetGlobalVariable('arthas_character').Char.GetTitledFirstName], I'm with you." wc_arthas_story_35_OPT_B_purge:1 "Have you lost your mind, [GetGlobalVariable('arthas_character').Char.GetFirstName]?" + wc_arthas_story_35_OPT_B_purge_uther:0 "This cannot be your decision. [GetGlobalVariable('arthas_character').Char.GetFirstName]..." wc_arthas_story_35_OPT_B_evacuate:0 "Enough... I'm leaving." wc_arthas_story_40_DESC_purge_group:1 "Following [GetGlobalVariable('arthas_character').Char.Custom2('GetTitledFirstNamePossessiveOrMy', ROOT.Char)] decision, tormented screams and fierce battles echo through the streets. The boundary between living and undead, good and evil, blurs until indistinguishable. The culling is unbroken during the day and continues far into the night; the flames of the burning city illuminate the dark sky. Our spirits are held up solely by [GetGlobalVariable('arthas_character').Char.Custom2('GetTitledFirstNamePossessiveOrMy', ROOT.Char)] monomaniacal will.\n\nInside the city, we find [GetGlobalVariable('malganis').Char.GetFirstName] and defeat [GetGlobalVariable('malganis').Char.GetHerHis] army. However the demon [GetGlobalVariable('malganis').Char.GetHerHim]self escaped, taunting us with an invitation to settle the score in the arctic continent of Northrend.\n\nThree days pass until the city is reduced to nothing but cinders; only then do [GetGlobalVariable('arthas_character').Char.Custom2('GetTitledFirstNamePossessiveOrMy', ROOT.Char)] soldiers finally find time to catch their breaths." diff --git a/localization/english/wc_uther_events_l_english.yml b/localization/english/wc_uther_events_l_english.yml index d360822b3b..64ca317221 100644 --- a/localization/english/wc_uther_events_l_english.yml +++ b/localization/english/wc_uther_events_l_english.yml @@ -3,4 +3,29 @@ uther_events.001.d:0 "By the light!\n\nCrisis has befallen Lordaeron. Prince Arthas has returned from Northrend, consumed by madness. He has slain his own father and now seeks to bring destruction to Lordaeron and beyond.\n\nHow could this happen? I was his mentor, it was my duty to instill in him the virtues of the Silver Hand. Even when he crossed the line and purged the innocent at Stratholme, he still sought to protect the kingdom. All rulers must make difficult decisions to protect their people. But now, I must make my own.\n\nMy fellow paladins have gathered, and now I am to lead them in destroying the undead Scourge. But with Arthas at it's helm, that will mean killing him..." uther_events.001.a:0 "No, I cannot. I shall discard my hammer, forever." uther_events.001.b:0 "Damn it, I will put you down, Arthas." - uther_events.001.c:0 "Lordaeron must be protected at any cost." \ No newline at end of file + uther_events.001.c:0 "Lordaeron must be protected at any cost." + uther_tooltip:0 "You will try and convince Arthas otherwise, or abandon the investigation." + uther_win_tooltip:0 "You convince him successfully." + uther_lose_tooltip:0 "You fail to convince him." + uther_stay_tooltip:0 "You will stay in the investigation party." + uther_events.002.t:0 "The Culling" + uther_events.002.d:0 "I nearly shudder when I hear the words come out of Arthas' mouth? #italic Purge?#! Who are we to sacrifice the innocents of Stratholme in pursuit of eradicating this plague?\n\nSurely this does not coincide with what I have been teaching him, and to kill is not a task that should be taken so lightly. Surely, there must be another way to save Stratholme. I must contemplate what the best course of action is from here, and quickly." + uther_events.002.a:0 "I cannot watch you do this, Arthas!" + uther_events.002.b:0 "Maybe I can convince him otherwise..." + uther_events.003.t:0 "The Fate of Stratholme" + uther_events.003.d:0 "Fortunately, I have succeeded in convincing Arthas there is another way to proceed with Strathlome. But now, the real battle begins. We must divise another way to save the city, as it's citizens are in dire need of our help.\n\nWe should..." + uther_events.003.a:0 "...Quarantine the city instead." + uther_events.003.b:0 "...Evacuate everyone." + uther_events.003.c:0 "...do whatever Arthas wants." + + uther_events.035.d:0 "Rejoice!\n\nArthas has decided on another plan. We will be trying something less... #italic extreme#!.\n\nBecause of [uther.GetNameNoTier]," + uther_events.035.d_q:0 " we will be attempting the quarantine the city instead. This will be a more gentle approach to the situation, albeit we will have quite the problem on our hand if it fails." + uther_events.035.d_e:0 " the city will be evacuated. We must be careful to identify sick citizens, so they do not spread the plague. This method will be risky, but it is better than them being dead..." + uther_events.035.a:0 "Thank the light! He was brought to his senses." + uther_events.035.b:0 "Why did he even consider that?" + uther_events.004.d_betrayal:0 "To my surprise, Arthas has gone behind my back, and decided to purge Strathlome once again! I can't believe he's done this.\n\n" + uther_events.004.d:0 "My plan to convince him has failed, and now others must suffer for my decision. I do not know if I can continue to mentor Arthas under this condition, he has gone mad.\n\nToday marks an important day for my dear Kingdom of Lordaeron. One that must not be forgotten, I forbid it. Innocents will die at Arthas' hand, and I cannot stop him. May they forgive me." + uther_events.004.a:0 "He cannot be saved." + uther_events.004.b:0 "I must take a more drastic approach." + uther_events.004.c:0 "There is nothing I can do..." + rival_purge_stratholme:0 "Purged Stratholme" \ No newline at end of file From 55ad623d237897ea57e4940721e49a7329545b67 Mon Sep 17 00:00:00 2001 From: name Date: Wed, 20 Dec 2023 13:59:28 -0500 Subject: [PATCH 02/12] some changes --- .../wc_arthas_expedition_events.txt | 10 ++--- events/wc_events/wc_uther_events.txt | 41 ++++++------------- .../english/wc_uther_events_l_english.yml | 1 - 3 files changed, 16 insertions(+), 36 deletions(-) diff --git a/events/activities/arthas_expedition_activity/wc_arthas_expedition_events.txt b/events/activities/arthas_expedition_activity/wc_arthas_expedition_events.txt index 86e90c2c6a..cf7a350390 100644 --- a/events/activities/arthas_expedition_activity/wc_arthas_expedition_events.txt +++ b/events/activities/arthas_expedition_activity/wc_arthas_expedition_events.txt @@ -526,10 +526,10 @@ wc_arthas_story.35 = { trigger = { NOR = { AND = { + scope:stratholme_action = flag:purge scope:activity = { has_variable = uther } root = scope:activity.var:uther scope:activity.var:uther = { is_alive = yes } - scope:activity.var:uther = { is_ai = yes } } AND = { scope:activity = { has_variable = jaina } @@ -556,7 +556,7 @@ wc_arthas_story.35 = { name = wc_arthas_story_35_OPT_B_purge_uther trigger = { - trigger = { scope:stratholme_action = flag:purge } + scope:stratholme_action = flag:purge scope:activity = { has_variable = uther } scope:activity.var:uther = { is_alive = yes } root = scope:activity.var:uther @@ -564,7 +564,6 @@ wc_arthas_story.35 = { scope:activity.var:uther = { is_uther_trigger = yes } #real uther } - scope:activity.var:uther = { add_character_flag = uther_decision trigger_event = { @@ -577,7 +576,6 @@ wc_arthas_story.35 = { ai_chance = { base = 15 - leave_event_modifier = yes modifier = { scope:activity.var:uther ?= root add = 5 @@ -632,10 +630,10 @@ wc_arthas_story.35 = { #wait for uther decision trigger_event = { id = wc_arthas_story.40 - days = 10 + days = 5 } current_travel_plan = { - delay_travel_plan = { days = 10 } + delay_travel_plan = { days = 5 } } } else = { diff --git a/events/wc_events/wc_uther_events.txt b/events/wc_events/wc_uther_events.txt index 91a8bfb9cb..a4887c59fd 100644 --- a/events/wc_events/wc_uther_events.txt +++ b/events/wc_events/wc_uther_events.txt @@ -77,6 +77,7 @@ uther_events.001 = { # The Culling uther_events.002 = { + type = activity_event title = uther_events.002.t desc = uther_events.002.d theme = plague @@ -124,18 +125,9 @@ uther_events.002 = { value = decent_skill_rating 50 = { modifier = { #rng - add = { -10 10 } + add = { -5 10 } is_alive = yes } - # AI more likely to lose to keep to original story - modifier = { - add = { -15 0 } - is_ai = yes - } - modifier = { - add = { 5 10 } - is_ai = no - } compare_modifier = { value = scope:duel_value multiplier = 3.5 @@ -163,6 +155,7 @@ uther_events.002 = { # Convince - Win uther_events.003 = { + type = activity_event title = uther_events.003.t desc = uther_events.003.d theme = plague @@ -188,13 +181,13 @@ uther_events.003 = { # Quarantine Instead option = { name = uther_events.003.a - save_scope_value_as = { name = stratholme_action value = flag:quarantine } + scope:activity = { save_scope_value_as = { name = stratholme_action value = flag:quarantine } } } # Evacuate instead option = { name = uther_events.003.b - save_scope_value_as = { name = stratholme_action value = flag:evacuate } + scope:activity = { save_scope_value_as = { name = stratholme_action value = flag:evacuate } } } # Arthas choice @@ -203,26 +196,13 @@ uther_events.003 = { hidden_effect = { random_list = { 40 = { # he decides to quarantine - save_scope_value_as = { name = stratholme_action value = flag:quarantine } - send_interface_toast = { - title = arthas_decides_q - desc = arthas_decides_q_desc - left_icon = scope:arthas - right_icon = root - } + scope:activity = { save_scope_value_as = { name = stratholme_action value = flag:quarantine } } } 40 = { # evac - save_scope_value_as = { name = stratholme_action value = flag:evacuate } - send_interface_toast = { - title = arthas_decides_e - desc = arthas_decides_e_desc - left_icon = scope:arthas - right_icon = root - } + scope:activity = { save_scope_value_as = { name = stratholme_action value = flag:evacuate } } } 20 = { #betray add_character_flag = arthas_betrayal - save_scope_value_as = { name = stratholme_action value = flag:purge } } } } @@ -230,7 +210,7 @@ uther_events.003 = { after = { if = { - limit = { NOT = { var:stratholme_action = flag:purge } } + limit = { NOT = { scope:activity = { var:stratholme_action = flag:purge } } } #notify group of change share_event_with_group_delay_effect = { ID = uther_events.035 @@ -242,6 +222,7 @@ uther_events.003 = { #Notif for group uther_events.035 = { + type = activity_event title = uther_events.003.t desc = { desc = uther_events.035.d @@ -258,7 +239,7 @@ uther_events.035 = { theme = plague trigger = { - NOT = { is_uther_trigger = yes } + NOT = { root = activity:host } } left_portrait = { @@ -289,6 +270,7 @@ uther_events.035 = { add_opinion = { target = scope:arthas modifier = disappointed_opinion + opinion = -15 } } @@ -301,6 +283,7 @@ uther_events.035 = { # Convince - Fail uther_events.004 = { + type = activity_event title = uther_events.003.t desc = { first_valid = { diff --git a/localization/english/wc_uther_events_l_english.yml b/localization/english/wc_uther_events_l_english.yml index 64ca317221..bd954b5f0e 100644 --- a/localization/english/wc_uther_events_l_english.yml +++ b/localization/english/wc_uther_events_l_english.yml @@ -17,7 +17,6 @@ uther_events.003.a:0 "...Quarantine the city instead." uther_events.003.b:0 "...Evacuate everyone." uther_events.003.c:0 "...do whatever Arthas wants." - uther_events.035.d:0 "Rejoice!\n\nArthas has decided on another plan. We will be trying something less... #italic extreme#!.\n\nBecause of [uther.GetNameNoTier]," uther_events.035.d_q:0 " we will be attempting the quarantine the city instead. This will be a more gentle approach to the situation, albeit we will have quite the problem on our hand if it fails." uther_events.035.d_e:0 " the city will be evacuated. We must be careful to identify sick citizens, so they do not spread the plague. This method will be risky, but it is better than them being dead..." From 55d7f6b5c5da716a6fa44583c2d071ae138b99c9 Mon Sep 17 00:00:00 2001 From: name Date: Wed, 20 Dec 2023 16:21:08 -0500 Subject: [PATCH 03/12] fixes --- common/on_action/death.txt | 2 +- .../wc_arthas_expedition_events.txt | 44 ++++++++++++++--- events/wc_events/wc_uther_events.txt | 48 +++++++++---------- .../wc_arthas_expedition_events_l_english.yml | 1 - .../english/wc_uther_events_l_english.yml | 2 +- 5 files changed, 61 insertions(+), 36 deletions(-) diff --git a/common/on_action/death.txt b/common/on_action/death.txt index 61b4f652c1..8c317a95fb 100644 --- a/common/on_action/death.txt +++ b/common/on_action/death.txt @@ -185,7 +185,7 @@ on_death = { # making sure arthas is actually evil arthas and didnt kill his father for no reason scope:killer = { is_ai = yes - date >= 603.5.1 + current_date >= 603.5.1 } scope:killer = { is_ai = no diff --git a/events/activities/arthas_expedition_activity/wc_arthas_expedition_events.txt b/events/activities/arthas_expedition_activity/wc_arthas_expedition_events.txt index cf7a350390..c16e9d79a3 100644 --- a/events/activities/arthas_expedition_activity/wc_arthas_expedition_events.txt +++ b/events/activities/arthas_expedition_activity/wc_arthas_expedition_events.txt @@ -630,10 +630,11 @@ wc_arthas_story.35 = { #wait for uther decision trigger_event = { id = wc_arthas_story.40 - days = 5 + days = 6 } + # This gives enough time for a decision to be made, and for arthas to do it, and then to decide to sail current_travel_plan = { - delay_travel_plan = { days = 5 } + delay_travel_plan = { days = 6 } } } else = { @@ -706,9 +707,25 @@ wc_arthas_story.40 = { } immediate = { + if = { #changes arthas decision based on uther event + limit = { scope:host = { has_character_flag = uther_q } } + save_scope_value_as = { name = stratholme_action value = flag:quarantine } + scope:host = { add_character_flag = { flag = original_purge days = 30 } } + current_travel_plan = { + delay_travel_plan = { days = 10 } + } + } + if = { + limit = { scope:host = { has_character_flag = uther_e } } + save_scope_value_as = { name = stratholme_action value = flag:evacuate } + scope:host = { add_character_flag = { flag = original_purge days = 30 } } + current_travel_plan = { + delay_travel_plan = { days = 10 } + } + } if = { limit = { root = scope:host } - + arthas_find_terenas_effect = yes scope:activity = { @@ -738,7 +755,7 @@ wc_arthas_story.40 = { } } } - + if = { limit = { scope:stratholme_action = flag:purge } purge_event_effect = yes @@ -750,19 +767,22 @@ wc_arthas_story.40 = { else = { quarantine_event_effect = yes } + } # Sail Northrend option = { trigger = { root = scope:host - scope:stratholme_action = flag:purge + OR = { + scope:host = { has_character_flag = original_purge } + scope:stratholme_action = flag:purge + } } name = wc_arthas_story_40_OPT_D sail_northrend_event_effect = yes - share_event_with_group_delay_effect = { ID = wc_arthas_story.45 DAYS = 1 } arthas_find_terenas_effect = yes global_var:terenas_character = { trigger_event = { id = wc_arthas_story.50 days = 1 } @@ -832,7 +852,6 @@ wc_arthas_story.40 = { } } } - # Reaction for world option = { trigger = { is_in_arthas_expedition_trigger = no } @@ -865,6 +884,17 @@ wc_arthas_story.40 = { } } } + after = { + if = { + limit = { + OR = { + scope:host = { has_character_flag = original_purge } + scope:stratholme_action = flag:purge + } + } + } + share_event_with_group_delay_effect = { ID = wc_arthas_story.45 DAYS = 1 } + } } # Arthas tells you about his plan to sail Northrend to chase Mal'ganis wc_arthas_story.45 = { diff --git a/events/wc_events/wc_uther_events.txt b/events/wc_events/wc_uther_events.txt index a4887c59fd..b307a34d35 100644 --- a/events/wc_events/wc_uther_events.txt +++ b/events/wc_events/wc_uther_events.txt @@ -1,4 +1,4 @@ -namespace = uther_events +namespace = uther_events # Death of Terenas uther_events.001 = { @@ -106,13 +106,14 @@ uther_events.002 = { involved_activity = { save_scope_as = activity } + save_scope_as = uther } # Leave option = { name = uther_events.002.a # Continue as normal - scope:activity = { trigger_event = { id = wc_arthas_story.40 days = 3 } } + #scope:activity = { trigger_event = { id = wc_arthas_story.40 days = 3 } } leave_arthas_expedition_event_effect = yes } @@ -122,7 +123,6 @@ uther_events.002 = { duel = { target = scope:host skills = { prowess intrigue } - value = decent_skill_rating 50 = { modifier = { #rng add = { -5 10 } @@ -177,17 +177,16 @@ uther_events.003 = { trigger = { is_uther_trigger = yes } - # Quarantine Instead option = { name = uther_events.003.a - scope:activity = { save_scope_value_as = { name = stratholme_action value = flag:quarantine } } + scope:host = { add_character_flag = {flag = uther_q days=10} } } # Evacuate instead option = { name = uther_events.003.b - scope:activity = { save_scope_value_as = { name = stratholme_action value = flag:evacuate } } + scope:host = { add_character_flag = {flag = uther_e days=10} } } # Arthas choice @@ -196,13 +195,14 @@ uther_events.003 = { hidden_effect = { random_list = { 40 = { # he decides to quarantine - scope:activity = { save_scope_value_as = { name = stratholme_action value = flag:quarantine } } + scope:host = { add_character_flag = {flag = uther_q days=10} } } 40 = { # evac - scope:activity = { save_scope_value_as = { name = stratholme_action value = flag:evacuate } } + scope:host = { add_character_flag = {flag = uther_e days=10} } } 20 = { #betray - add_character_flag = arthas_betrayal + # no flag for arthas + add_character_flag = {flag = arthas_betrayal days=10} } } } @@ -210,13 +210,18 @@ uther_events.003 = { after = { if = { - limit = { NOT = { scope:activity = { var:stratholme_action = flag:purge } } } + limit = { NOT = { has_character_flag = arthas_betrayal } } #notify group of change share_event_with_group_delay_effect = { ID = uther_events.035 DAYS = 1 } } + else = { + trigger_event = { + id = uther_events.004 + } + } } } @@ -227,11 +232,11 @@ uther_events.035 = { desc = { desc = uther_events.035.d triggered_desc = { - trigger = { var:stratholme_action = flag:quarantine } + trigger = { scope:host = { has_character_flag = uther_q } } desc = uther_events.035.d_q } triggered_desc = { - trigger = { var:stratholme_action = flag:evacuate } + trigger = { scope:host = { has_character_flag = uther_e } } desc = uther_events.035.d_e } } @@ -239,7 +244,7 @@ uther_events.035 = { theme = plague trigger = { - NOT = { root = activity:host } + NOT = { root = scope:host } } left_portrait = { @@ -248,15 +253,10 @@ uther_events.035 = { } right_portrait = { - character = scope:arthas + character = scope:host animation = personality_bold } - lower_center_portrait = { - character = scope:activity.var:uther - animation = idle - } - override_background = { reference = wc_stratholme } @@ -268,7 +268,7 @@ uther_events.035 = { option = { # why would he consider doing that name = uther_events.035.b add_opinion = { - target = scope:arthas + target = scope:host modifier = disappointed_opinion opinion = -15 } @@ -277,7 +277,7 @@ uther_events.035 = { after = { remove_character_flag = uther_decision # Continue as normal - scope:activity = { trigger_event = { id = wc_arthas_story.40 days = 3 } } + #scope:activity = { trigger_event = { id = wc_arthas_story.40 days = 3 } } } @@ -377,12 +377,8 @@ uther_events.004 = { after = { - if = { - limit = { has_character_flag = arthas_betrayal } - remove_character_flag = arthas_betrayal - } remove_character_flag = uther_decision # Continue as normal - scope:activity = { trigger_event = { id = wc_arthas_story.40 days = 3 } } + #scope:activity = { trigger_event = { id = wc_arthas_story.40 days = 3 } } } } \ No newline at end of file diff --git a/localization/english/event_localization/wc_arthas_expedition_events_l_english.yml b/localization/english/event_localization/wc_arthas_expedition_events_l_english.yml index 3d31f3cb0c..7ed602d921 100644 --- a/localization/english/event_localization/wc_arthas_expedition_events_l_english.yml +++ b/localization/english/event_localization/wc_arthas_expedition_events_l_english.yml @@ -60,7 +60,6 @@ wc_arthas_story_40_OPT_B_positive:0 "How pity..." wc_arthas_story_40_OPT_B_neutral:0 "Interesting." wc_arthas_story_40_OPT_D:0 "To the ends of the earth!" - wc_arthas_story_45_TITLE:0 "Ends of the Earth" wc_arthas_story_45_DESC:1 "The surviving citizens pile the corpses of the dead onto pyres. Our group quickly learns that the undead commander [GetGlobalVariable('malganis').Char.GetFirstName] has fled to the frozen continent of Northrend, and our commander requires us to pursue [GetGlobalVariable('malganis').Char.GetHerHim] across the sea.\n\nWith the undead forces at [GetGlobalVariable('stratholme').Title.GetNameNoTier] defeated, many members of our expedition feel our mission is complete, yet [GetGlobalVariable('arthas_character').Char.GetFirstName], in [GetGlobalVariable('arthas_character').Char.GetHerHis] beginning madness, seems intent on hunting [GetGlobalVariable('malganis').Char.GetFirstName] to the ends of the earth. We are to rally at the shores of the city with [GetGlobalVariable('arthas_character').Char.GetFirstName] to man the navy ships and set sail." wc_arthas_story_45_OPT_A:0 "I'll follow!" diff --git a/localization/english/wc_uther_events_l_english.yml b/localization/english/wc_uther_events_l_english.yml index bd954b5f0e..4b26410901 100644 --- a/localization/english/wc_uther_events_l_english.yml +++ b/localization/english/wc_uther_events_l_english.yml @@ -17,7 +17,7 @@ uther_events.003.a:0 "...Quarantine the city instead." uther_events.003.b:0 "...Evacuate everyone." uther_events.003.c:0 "...do whatever Arthas wants." - uther_events.035.d:0 "Rejoice!\n\nArthas has decided on another plan. We will be trying something less... #italic extreme#!.\n\nBecause of [uther.GetNameNoTier]," + uther_events.035.d:0 "Rejoice!\n\nArthas has decided on another plan. We will be trying something less... #italic extreme#!.\n\nBecause of [uther.GetName]," uther_events.035.d_q:0 " we will be attempting the quarantine the city instead. This will be a more gentle approach to the situation, albeit we will have quite the problem on our hand if it fails." uther_events.035.d_e:0 " the city will be evacuated. We must be careful to identify sick citizens, so they do not spread the plague. This method will be risky, but it is better than them being dead..." uther_events.035.a:0 "Thank the light! He was brought to his senses." From 00cda4db689da20c75aa497236670e2d4468c73e Mon Sep 17 00:00:00 2001 From: dione Date: Mon, 25 Dec 2023 18:37:59 -0500 Subject: [PATCH 04/12] Update localization/english/event_localization/wc_arthas_expedition_events_l_english.yml Co-authored-by: Edmund <447ght@gmail.com> --- .../wc_arthas_expedition_events_l_english.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/localization/english/event_localization/wc_arthas_expedition_events_l_english.yml b/localization/english/event_localization/wc_arthas_expedition_events_l_english.yml index 7ed602d921..fee5d32644 100644 --- a/localization/english/event_localization/wc_arthas_expedition_events_l_english.yml +++ b/localization/english/event_localization/wc_arthas_expedition_events_l_english.yml @@ -45,7 +45,7 @@ wc_arthas_story_35_OPT_A_purge:0 "It must be done." wc_arthas_story_35_OPT_A_evacuate:1 "[GetGlobalVariable('arthas_character').Char.GetTitledFirstName], I'm with you." wc_arthas_story_35_OPT_B_purge:1 "Have you lost your mind, [GetGlobalVariable('arthas_character').Char.GetFirstName]?" - wc_arthas_story_35_OPT_B_purge_uther:0 "This cannot be your decision. [GetGlobalVariable('arthas_character').Char.GetFirstName]..." + wc_arthas_story_35_OPT_B_purge_uther:0 "This cannot be your decision, [GetGlobalVariable('arthas_character').Char.GetFirstName]..." wc_arthas_story_35_OPT_B_evacuate:0 "Enough... I'm leaving." wc_arthas_story_40_DESC_purge_group:1 "Following [GetGlobalVariable('arthas_character').Char.Custom2('GetTitledFirstNamePossessiveOrMy', ROOT.Char)] decision, tormented screams and fierce battles echo through the streets. The boundary between living and undead, good and evil, blurs until indistinguishable. The culling is unbroken during the day and continues far into the night; the flames of the burning city illuminate the dark sky. Our spirits are held up solely by [GetGlobalVariable('arthas_character').Char.Custom2('GetTitledFirstNamePossessiveOrMy', ROOT.Char)] monomaniacal will.\n\nInside the city, we find [GetGlobalVariable('malganis').Char.GetFirstName] and defeat [GetGlobalVariable('malganis').Char.GetHerHis] army. However the demon [GetGlobalVariable('malganis').Char.GetHerHim]self escaped, taunting us with an invitation to settle the score in the arctic continent of Northrend.\n\nThree days pass until the city is reduced to nothing but cinders; only then do [GetGlobalVariable('arthas_character').Char.Custom2('GetTitledFirstNamePossessiveOrMy', ROOT.Char)] soldiers finally find time to catch their breaths." From 0174b6b9cbc5702eb44c4d07b1761928b52e4062 Mon Sep 17 00:00:00 2001 From: dione Date: Mon, 25 Dec 2023 18:38:41 -0500 Subject: [PATCH 05/12] Update localization/english/wc_uther_events_l_english.yml Co-authored-by: Edmund <447ght@gmail.com> --- localization/english/wc_uther_events_l_english.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/localization/english/wc_uther_events_l_english.yml b/localization/english/wc_uther_events_l_english.yml index 4b26410901..fb551ee2d5 100644 --- a/localization/english/wc_uther_events_l_english.yml +++ b/localization/english/wc_uther_events_l_english.yml @@ -13,7 +13,7 @@ uther_events.002.a:0 "I cannot watch you do this, Arthas!" uther_events.002.b:0 "Maybe I can convince him otherwise..." uther_events.003.t:0 "The Fate of Stratholme" - uther_events.003.d:0 "Fortunately, I have succeeded in convincing Arthas there is another way to proceed with Strathlome. But now, the real battle begins. We must divise another way to save the city, as it's citizens are in dire need of our help.\n\nWe should..." + uther_events.003.d:0 "Fortunately, I have succeeded in convincing Arthas there is another way to proceed with Strathlome. But now, the real battle begins. We must devise another way to save the city, as its citizens are in dire need of our help.\n\nWe should..." uther_events.003.a:0 "...Quarantine the city instead." uther_events.003.b:0 "...Evacuate everyone." uther_events.003.c:0 "...do whatever Arthas wants." From 542b75654dc5a67122164e3f1194f7b32a8e9e74 Mon Sep 17 00:00:00 2001 From: dione Date: Mon, 25 Dec 2023 18:39:36 -0500 Subject: [PATCH 06/12] Update localization/english/wc_uther_events_l_english.yml Co-authored-by: Edmund <447ght@gmail.com> --- localization/english/wc_uther_events_l_english.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/localization/english/wc_uther_events_l_english.yml b/localization/english/wc_uther_events_l_english.yml index fb551ee2d5..683e8fd5ea 100644 --- a/localization/english/wc_uther_events_l_english.yml +++ b/localization/english/wc_uther_events_l_english.yml @@ -23,7 +23,7 @@ uther_events.035.a:0 "Thank the light! He was brought to his senses." uther_events.035.b:0 "Why did he even consider that?" uther_events.004.d_betrayal:0 "To my surprise, Arthas has gone behind my back, and decided to purge Strathlome once again! I can't believe he's done this.\n\n" - uther_events.004.d:0 "My plan to convince him has failed, and now others must suffer for my decision. I do not know if I can continue to mentor Arthas under this condition, he has gone mad.\n\nToday marks an important day for my dear Kingdom of Lordaeron. One that must not be forgotten, I forbid it. Innocents will die at Arthas' hand, and I cannot stop him. May they forgive me." + uther_events.004.d:0 "[GetGlobalVariable('arthas_character').Char.GetFirstName] has gone mad! My attempts to convince [GetGlobalVariable('arthas_character').Char.GetHerHim] have failed, and now others must suffer for my lacking. I do not believe I can continue to mentor [GetGlobalVariable('arthas_character').Char.GetFirstName] in this condition.\n\nThis day will be ever remembered as a grave historic trauma for my cherished Kingdom of Lordaeron. Innocents will die at [GetGlobalVariable('arthas_character').Char.GetFirstNamePossessive] hand, and I cannot stop him. May they and the $HighGodNameAlternate$ forgive me." uther_events.004.a:0 "He cannot be saved." uther_events.004.b:0 "I must take a more drastic approach." uther_events.004.c:0 "There is nothing I can do..." From a60ab0907ca397465eecb5f57f197b8570871c38 Mon Sep 17 00:00:00 2001 From: dione Date: Mon, 25 Dec 2023 18:39:47 -0500 Subject: [PATCH 07/12] Update localization/english/wc_uther_events_l_english.yml Co-authored-by: Edmund <447ght@gmail.com> --- localization/english/wc_uther_events_l_english.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/localization/english/wc_uther_events_l_english.yml b/localization/english/wc_uther_events_l_english.yml index 683e8fd5ea..eca451ddae 100644 --- a/localization/english/wc_uther_events_l_english.yml +++ b/localization/english/wc_uther_events_l_english.yml @@ -17,7 +17,7 @@ uther_events.003.a:0 "...Quarantine the city instead." uther_events.003.b:0 "...Evacuate everyone." uther_events.003.c:0 "...do whatever Arthas wants." - uther_events.035.d:0 "Rejoice!\n\nArthas has decided on another plan. We will be trying something less... #italic extreme#!.\n\nBecause of [uther.GetName]," + uther_events.035.d:0 "Rejoice!\n\n[GetGlobalVariable('arthas_character').Char.GetTitledFirstName] has decided on another plan. We will be trying something less... #italic extreme#!.\n\nBecause of [uther.GetName]," uther_events.035.d_q:0 " we will be attempting the quarantine the city instead. This will be a more gentle approach to the situation, albeit we will have quite the problem on our hand if it fails." uther_events.035.d_e:0 " the city will be evacuated. We must be careful to identify sick citizens, so they do not spread the plague. This method will be risky, but it is better than them being dead..." uther_events.035.a:0 "Thank the light! He was brought to his senses." From dbbfa1f521e21f07377d33e5653dbc976ee44e19 Mon Sep 17 00:00:00 2001 From: dione Date: Sun, 14 Jan 2024 10:18:27 -0500 Subject: [PATCH 08/12] Update localization/english/wc_uther_events_l_english.yml Co-authored-by: Edmund <447ght@gmail.com> --- localization/english/wc_uther_events_l_english.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/localization/english/wc_uther_events_l_english.yml b/localization/english/wc_uther_events_l_english.yml index eca451ddae..7ec17e07ff 100644 --- a/localization/english/wc_uther_events_l_english.yml +++ b/localization/english/wc_uther_events_l_english.yml @@ -4,7 +4,7 @@ uther_events.001.a:0 "No, I cannot. I shall discard my hammer, forever." uther_events.001.b:0 "Damn it, I will put you down, Arthas." uther_events.001.c:0 "Lordaeron must be protected at any cost." - uther_tooltip:0 "You will try and convince Arthas otherwise, or abandon the investigation." + uther_tooltip:0 "You will try and convince [GetGlobalVariable('arthas_character').Char.GetFirstName] otherwise, or abandon the investigation." uther_win_tooltip:0 "You convince him successfully." uther_lose_tooltip:0 "You fail to convince him." uther_stay_tooltip:0 "You will stay in the investigation party." From f5da74b30270e8512d64d3809f72ff6448d0f145 Mon Sep 17 00:00:00 2001 From: dione Date: Sun, 14 Jan 2024 10:18:38 -0500 Subject: [PATCH 09/12] Update localization/english/wc_uther_events_l_english.yml Co-authored-by: Edmund <447ght@gmail.com> --- localization/english/wc_uther_events_l_english.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/localization/english/wc_uther_events_l_english.yml b/localization/english/wc_uther_events_l_english.yml index 7ec17e07ff..c58cee09d7 100644 --- a/localization/english/wc_uther_events_l_english.yml +++ b/localization/english/wc_uther_events_l_english.yml @@ -10,7 +10,7 @@ uther_stay_tooltip:0 "You will stay in the investigation party." uther_events.002.t:0 "The Culling" uther_events.002.d:0 "I nearly shudder when I hear the words come out of Arthas' mouth? #italic Purge?#! Who are we to sacrifice the innocents of Stratholme in pursuit of eradicating this plague?\n\nSurely this does not coincide with what I have been teaching him, and to kill is not a task that should be taken so lightly. Surely, there must be another way to save Stratholme. I must contemplate what the best course of action is from here, and quickly." - uther_events.002.a:0 "I cannot watch you do this, Arthas!" + uther_events.002.a:0 "I cannot watch you do this, [GetGlobalVariable('arthas_character').Char.GetFirstName]!" uther_events.002.b:0 "Maybe I can convince him otherwise..." uther_events.003.t:0 "The Fate of Stratholme" uther_events.003.d:0 "Fortunately, I have succeeded in convincing Arthas there is another way to proceed with Strathlome. But now, the real battle begins. We must devise another way to save the city, as its citizens are in dire need of our help.\n\nWe should..." From 271035724fc641217609bf101357773d427fd015 Mon Sep 17 00:00:00 2001 From: dione Date: Sun, 14 Jan 2024 10:18:49 -0500 Subject: [PATCH 10/12] Update localization/english/wc_uther_events_l_english.yml Co-authored-by: Edmund <447ght@gmail.com> --- localization/english/wc_uther_events_l_english.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/localization/english/wc_uther_events_l_english.yml b/localization/english/wc_uther_events_l_english.yml index c58cee09d7..1ccf0150c5 100644 --- a/localization/english/wc_uther_events_l_english.yml +++ b/localization/english/wc_uther_events_l_english.yml @@ -16,7 +16,7 @@ uther_events.003.d:0 "Fortunately, I have succeeded in convincing Arthas there is another way to proceed with Strathlome. But now, the real battle begins. We must devise another way to save the city, as its citizens are in dire need of our help.\n\nWe should..." uther_events.003.a:0 "...Quarantine the city instead." uther_events.003.b:0 "...Evacuate everyone." - uther_events.003.c:0 "...do whatever Arthas wants." + uther_events.003.c:0 "...do whatever [GetGlobalVariable('arthas_character').Char.GetFirstName] wants." uther_events.035.d:0 "Rejoice!\n\n[GetGlobalVariable('arthas_character').Char.GetTitledFirstName] has decided on another plan. We will be trying something less... #italic extreme#!.\n\nBecause of [uther.GetName]," uther_events.035.d_q:0 " we will be attempting the quarantine the city instead. This will be a more gentle approach to the situation, albeit we will have quite the problem on our hand if it fails." uther_events.035.d_e:0 " the city will be evacuated. We must be careful to identify sick citizens, so they do not spread the plague. This method will be risky, but it is better than them being dead..." From 3d53a537dac52a2a5bc9b6b7aa753fc82637816b Mon Sep 17 00:00:00 2001 From: dione Date: Sun, 14 Jan 2024 10:18:57 -0500 Subject: [PATCH 11/12] Update localization/english/wc_uther_events_l_english.yml Co-authored-by: Edmund <447ght@gmail.com> --- localization/english/wc_uther_events_l_english.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/localization/english/wc_uther_events_l_english.yml b/localization/english/wc_uther_events_l_english.yml index 1ccf0150c5..73fc7b07ef 100644 --- a/localization/english/wc_uther_events_l_english.yml +++ b/localization/english/wc_uther_events_l_english.yml @@ -22,7 +22,7 @@ uther_events.035.d_e:0 " the city will be evacuated. We must be careful to identify sick citizens, so they do not spread the plague. This method will be risky, but it is better than them being dead..." uther_events.035.a:0 "Thank the light! He was brought to his senses." uther_events.035.b:0 "Why did he even consider that?" - uther_events.004.d_betrayal:0 "To my surprise, Arthas has gone behind my back, and decided to purge Strathlome once again! I can't believe he's done this.\n\n" + uther_events.004.d_betrayal:0 "To my surprise, [GetGlobalVariable('arthas_character').Char.GetFirstName] has gone behind my back and decided to purge Strathlome once again! I can't believe he's done this.\n\n" uther_events.004.d:0 "[GetGlobalVariable('arthas_character').Char.GetFirstName] has gone mad! My attempts to convince [GetGlobalVariable('arthas_character').Char.GetHerHim] have failed, and now others must suffer for my lacking. I do not believe I can continue to mentor [GetGlobalVariable('arthas_character').Char.GetFirstName] in this condition.\n\nThis day will be ever remembered as a grave historic trauma for my cherished Kingdom of Lordaeron. Innocents will die at [GetGlobalVariable('arthas_character').Char.GetFirstNamePossessive] hand, and I cannot stop him. May they and the $HighGodNameAlternate$ forgive me." uther_events.004.a:0 "He cannot be saved." uther_events.004.b:0 "I must take a more drastic approach." From e7b4b47ad620bc072805199daffd6e45eb0b9596 Mon Sep 17 00:00:00 2001 From: dione Date: Sun, 14 Jan 2024 10:19:11 -0500 Subject: [PATCH 12/12] Update localization/english/wc_uther_events_l_english.yml Co-authored-by: Edmund <447ght@gmail.com> --- localization/english/wc_uther_events_l_english.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/localization/english/wc_uther_events_l_english.yml b/localization/english/wc_uther_events_l_english.yml index 73fc7b07ef..a12a5d72f9 100644 --- a/localization/english/wc_uther_events_l_english.yml +++ b/localization/english/wc_uther_events_l_english.yml @@ -9,7 +9,7 @@ uther_lose_tooltip:0 "You fail to convince him." uther_stay_tooltip:0 "You will stay in the investigation party." uther_events.002.t:0 "The Culling" - uther_events.002.d:0 "I nearly shudder when I hear the words come out of Arthas' mouth? #italic Purge?#! Who are we to sacrifice the innocents of Stratholme in pursuit of eradicating this plague?\n\nSurely this does not coincide with what I have been teaching him, and to kill is not a task that should be taken so lightly. Surely, there must be another way to save Stratholme. I must contemplate what the best course of action is from here, and quickly." + uther_events.002.d:0 "I nearly shudder when I hear the words come out of Arthas' mouth... #italic Purge?#! Who are we to sacrifice the innocents of Stratholme in pursuit of eradicating this plague?\n\nSurely this does not coincide with what I have been teaching him, and to kill is not a task that should be taken so lightly. Surely, there must be another way to save Stratholme. I must contemplate what the best course of action is from here, and quickly." uther_events.002.a:0 "I cannot watch you do this, [GetGlobalVariable('arthas_character').Char.GetFirstName]!" uther_events.002.b:0 "Maybe I can convince him otherwise..." uther_events.003.t:0 "The Fate of Stratholme"