From afca855bf0d8a485819f41eea2e951cbf80f0e0f Mon Sep 17 00:00:00 2001 From: name Date: Wed, 20 Dec 2023 12:54:51 -0500 Subject: [PATCH] Revert "add uther to plague investigation, convince arthas (no ai)" This reverts commit 12ee875211d3d2260f55c8a77a00818f9229a68b. --- 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, 16 insertions(+), 459 deletions(-) diff --git a/common/on_action/death.txt b/common/on_action/death.txt index 61b4f652c1..bb12e02be8 100644 --- a/common/on_action/death.txt +++ b/common/on_action/death.txt @@ -200,7 +200,6 @@ 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 f7054fe746..0edf162d02 100644 --- a/common/script_values/wc_arthas_expedition_values.txt +++ b/common/script_values/wc_arthas_expedition_values.txt @@ -97,15 +97,6 @@ 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 38e51c7416..d8d0f87d43 100644 --- a/common/scripted_effects/wc_arthas_expedition_effects.txt +++ b/common/scripted_effects/wc_arthas_expedition_effects.txt @@ -17,23 +17,21 @@ 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 = { # Uther wont be invited with the normal trigger - is_available_for_activity_trigger = yes + limit = { + is_ai = yes + + can_be_invited_in_arthas_expedition_trigger = { INVITER = scope:host } } 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 86e90c2c6a..fd230a0575 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,7 +124,6 @@ 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 @@ -299,7 +298,6 @@ wc_arthas_story.30 = { NOT = { root = scope:host } } } - on_trigger_fail = { # Stops the event chain if = { @@ -400,11 +398,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 & Uther's interference) +# Arthas tells you about his decision (it depends on Arthas' decision above) wc_arthas_story.35 = { type = activity_event title = { @@ -482,7 +480,6 @@ wc_arthas_story.35 = { purge_event_modifier = yes } - } # Stay (evacuate) option = { @@ -524,18 +521,10 @@ wc_arthas_story.35 = { } } trigger = { - 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 - } + NAND = { + scope:activity = { has_variable = jaina } + scope:activity.var:jaina = { is_alive = yes } + root = scope:activity.var:jaina } } @@ -551,39 +540,6 @@ 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 = { @@ -624,26 +580,6 @@ 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 41b161c094..3c80f17e43 100644 --- a/events/wc_events/wc_uther_events.txt +++ b/events/wc_events/wc_uther_events.txt @@ -5,11 +5,9 @@ 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 } @@ -38,12 +36,10 @@ 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 = { @@ -56,350 +52,13 @@ 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 - add_prowess_skill = 5 - + set_character_faith = faith:scarlet + 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 = zealous - 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 3d31f3cb0c..ed276ea40a 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,6 @@ 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 64ca317221..d360822b3b 100644 --- a/localization/english/wc_uther_events_l_english.yml +++ b/localization/english/wc_uther_events_l_english.yml @@ -3,29 +3,4 @@ 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." - 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 + uther_events.001.c:0 "Lordaeron must be protected at any cost." \ No newline at end of file