diff --git a/common/modifiers/wc_event_modifiers.txt b/common/modifiers/wc_event_modifiers.txt index e4bf0271ed..f7b7031188 100644 --- a/common/modifiers/wc_event_modifiers.txt +++ b/common/modifiers/wc_event_modifiers.txt @@ -354,7 +354,6 @@ wc_suramar_ruler_modifier = { monthly_lifestyle_xp_gain_mult = 0.15 prowess = 2 learning = 2 - #TODO_WARCRAFT - mana regen } wc_suramar_vaults_bad_modifier = { @@ -368,8 +367,6 @@ wc_suramar_studying_monsters_modifier = { icon = learning_positive monthly_prestige = 0.5 learning = 2 - - #TODO_WARCRAFT - magical prowess } wc_suramar_beauty_queen_modifier = { @@ -400,7 +397,6 @@ wc_suramar_persecuting_elunists_modifier = { wc_suramar_mana_crystals_modifier = { icon = magic_positive diplomacy = 3 - #TODO_WARCRAFT - max mana } wc_suramar_dark_titan_modifier = { @@ -418,7 +414,6 @@ wc_suramar_good_drink_modifier = { negate_health_penalty_add = 0.25 stress_gain_mult = -0.25 diplomacy = 1 - #mana conductivity } wc_suramar_supporting_arcwinists_modifier = { @@ -449,7 +444,6 @@ wc_suramar_drained_mana_modifier = { monthly_prestige = 0.3 monthly_piety = 0.3 - #TODO_WARCRAFT - mana regen } wc_suramar_faldorei_anger_modifier = { @@ -481,7 +475,6 @@ wc_suramar_blessing_arcandor_modifier = { monthly_prestige = 0.5 health = 0.5 prowess = 1 - #TODO_WARCRAFT - magical prowess } wc_suramar_sacrifice_arcandor_modifier = { @@ -489,5 +482,4 @@ wc_suramar_sacrifice_arcandor_modifier = { monthly_piety = 0.5 learning = 3 - #TODO_WARCRAFT - mana regen, max mana } \ No newline at end of file diff --git a/common/script_values/wc_magic_spell_values.txt b/common/script_values/wc_magic_spell_values.txt index 5035a3193a..a66dd6857d 100644 --- a/common/script_values/wc_magic_spell_values.txt +++ b/common/script_values/wc_magic_spell_values.txt @@ -284,6 +284,19 @@ wc_magic_cast_time_value = { # Use for changing Cast time for ALL spells (multip } } } + if = { + limit = { + has_character_modifier = wc_suramar_sacrifice_arcandor_modifier + } + multiply = { + value = 1 + subtract = { + add = 0.15 + desc = wc_suramar_sacrifice_arcandor_modifier + format = "WC_MAX_MANA_VALUE_FORMAT_PER" + } + } + } } wc_magic_duration_value = { # Use for changing Duration for ALL spells (multiply this value) value = 1 diff --git a/common/script_values/wc_magic_values.txt b/common/script_values/wc_magic_values.txt index cd9680f50b..61be3857b3 100644 --- a/common/script_values/wc_magic_values.txt +++ b/common/script_values/wc_magic_values.txt @@ -757,6 +757,17 @@ wc_max_mana_value = { multiply = { value = 1 + if = { + limit = { + has_character_modifier = wc_suramar_mana_crystals_modifier + } + add = { + desc = wc_suramar_mana_crystals_modifier + format = "WC_MANA_REGENERATION_VALUE_PERCENTAGE_FORMAT" + value = 0.15 + } + } + if = { limit = { has_character_modifier = wc_conjure_drink_modifier @@ -864,6 +875,17 @@ wc_mana_regeneration_value = { } } + if = { + limit = { has_character_modifier = wc_suramar_ruler_modifier } + + add = { + desc = wc_suramar_ruler_modifier + format = "WC_MAX_MANA_VALUE_FORMAT" + + value = 1 + } + } + multiply = { # Mana Regeneration value = 1 @@ -976,6 +998,7 @@ wc_burned_2_trait_current_mana_to_prowess_value = 0.005 wc_burned_3_trait_current_mana_to_prowess_value = 0.008 wc_arcane_dialectics_current_mana_to_prowess_value = 0.03 wc_quickening_current_mana_to_prowess_value = 0.01 +wc_suramar_drink_current_mana_to_prowess_value = 0.01 wc_current_mana_to_prowess_base_percent = 0.01 # Also used in localization @@ -1054,6 +1077,15 @@ wc_current_mana_to_prowess_percent = { } } + f = { + limit = { + has_character_modifier = wc_suramar_good_drink_modifier + } + add = { + value = wc_suramar_drink_current_mana_to_prowess_value + } + } + if = { limit = { has_perk = light_magic_tree_2_perk_2 @@ -1656,6 +1688,26 @@ wc_mp_value = { value = wc_mp_special_race_value } } + if = { + limit = { + has_character_modifier = wc_suramar_studying_monsters_modifier + } + add = { + format = "WC_MAX_MANA_VALUE_FORMAT" + desc = wc_suramar_studying_monsters_modifier + value = 3 + } + } + if = { + limit = { + has_character_modifier = wc_suramar_blessing_arcandor_modifier + } + add = { + format = "WC_MAX_MANA_VALUE_FORMAT" + desc = wc_suramar_blessing_arcandor_modifier + value = 5 + } + } if = { limit = { has_character_modifier = wc_burnout_modifier diff --git a/events/wc_events/wc_suramar_events.txt b/events/wc_events/wc_suramar_events.txt index 3b06da7d41..af834d455b 100644 --- a/events/wc_events/wc_suramar_events.txt +++ b/events/wc_events/wc_suramar_events.txt @@ -3821,7 +3821,10 @@ wc_suramar_events.0080 = { years = 3 } - #TODO_WARCRAFT gain mana + wc_change_mana_by_value_effect = { + CHANGE = add + VALUE = 40 + } ai_chance = { base = 75 diff --git a/localization/english/event_localization/wc_suramar_events_l_english.yml b/localization/english/event_localization/wc_suramar_events_l_english.yml index c36fa0b996..3878bca936 100644 --- a/localization/english/event_localization/wc_suramar_events_l_english.yml +++ b/localization/english/event_localization/wc_suramar_events_l_english.yml @@ -9,7 +9,7 @@ l_english: wc_suramar_city_modifier: "City Renovations" wc_suramar_city_modifier_desc: "This city is undergoing massive a massive development project, with new buildings and districts being constructed." wc_suramar_ruler_modifier: "Anointed Ruler" - wc_suramar_ruler_modifier_desc: "This character is harnessing their wisdom in order to grow more powerful." + wc_suramar_ruler_modifier_desc: "This character is harnessing their wisdom in order to grow more powerful.\n[wc_mana_regeneration|E]: @wc_full_mana_icon! #P +1#!" wc_suramar_events.001.a: "It's time to focus on building the city." wc_suramar_events.001.b: "My power is all that matters." @@ -97,7 +97,7 @@ l_english: wc_suramar_events.0012.outsider_1:0 "Come with me, strange creature..." wc_suramar_events.0012.outsider_2:0 "What are you? Die!" wc_suramar_studying_monsters_modifier:0 "Studying Monsters" - wc_suramar_studying_monsters_modifier_desc:0 "This character is studying a corpse of an unknown entity found in their vaults, and is benefiting from the research." + wc_suramar_studying_monsters_modifier_desc:0 "This character is studying a corpse of an unknown entity found in their vaults, and is benefiting from the research.\n[wc_magical_prowess|E] #P +3#!" wc_suramar_events.0112.desc_nightfallen_outro:0 "This elf, however, is not unfamiliar to me. Yes, [secondary_character.GetFirstName] was once of Suramar, but had left the land. Is this what happens to those who venture out?" wc_suramar_events.0012.nightfallen_1:0 "Elf, come with me." wc_suramar_events.0012.nightfallen_2:0 "Die, wretched creature!" @@ -179,7 +179,7 @@ l_english: wc_suramar_events.0044.b_fail:0 "The crystals shatter in your hands" wc_suramar_events.0044.c:0 "I'm getting hungry.." wc_suramar_mana_crystals_modifier:0 "Mana Crystals" - wc_suramar_mana_crystals_modifier_desc:0 "This character found a cache of mana crystals in the tunnels." + wc_suramar_mana_crystals_modifier_desc:0 "This character found a cache of mana crystals in the tunnels.\[wc_max_mana|E]: @wc_full_mana_icon!#P +15%#!" wc_suramar_events.0044.c_tt:0 "You munch on the corpse of [corpse.GetFirstName]" wc_suramar_events.0050.t:0 "A Dark Omen" @@ -201,7 +201,7 @@ l_english: wc_suramar_events.0060.c:0 "I'll take another glass, thank you." wc_suramar_events.0060.d:0 "Offering random strangers drinks? How foolish." wc_suramar_good_drink_modifier:0 "Tasty Arcwine" - wc_suramar_good_drink_modifier_desc:0 "This character has tasted a delicious arcwine, and is in a good mood." + wc_suramar_good_drink_modifier_desc:0 "This character has tasted a delicious arcwine, and is in a good mood.\n$wc_available_mana_to_prowess_modifier_line$[EmptyScope.ScriptValue('wc_suramar_drink_current_mana_to_prowess_value')|0%=+]" wc_suramar_supporting_arcwinists_modifier:0 "Supporting Arcwinists" wc_suramar_supporting_arcwinists_modifier_desc:0 "This character is supporting the cultivation of arcwine, and will serve it at their next feast.\n[GetActivityType( 'activity_feast' ).GetName] Cost: #p -25%#!" MODIFIER_DESC_wc_suramar_supporting_arcwinists_modifier:0 "[GetModifier('wc_suramar_supporting_arcwinists_modifier').GetNameWithTooltip]" @@ -332,10 +332,10 @@ l_english: wc_suramar_events.1000.b_tt_dom:0 "You travel to [GetTitleByKey('c_meredil').GetName] to see the Arcan'dor tree with your [domicile|E]." wc_suramar_blessing_arcandor_modifier:0 "Blessing of the Arcan'dor" - wc_suramar_blessing_arcandor_modifier_desc:0 "This character has been blessed by the Arcan'dor tree, and is benefiting from its power." + wc_suramar_blessing_arcandor_modifier_desc:0 "This character has been blessed by the Arcan'dor tree, and is benefiting from its power.\n[wc_magical_prowess|E] #P +5#!" wc_suramar_sacrifice_arcandor_modifier:0 "Sacrifice of the Arcan'dor" - wc_suramar_sacrifice_arcandor_modifier_desc:0 "This character has sewn the seed of the Arcan'dor tree, and is benefiting from its power." + wc_suramar_sacrifice_arcandor_modifier_desc:0 "This character has sewn the seed of the Arcan'dor tree, and is benefiting from its power.\n[wc_spell|E] Cast Time: @wc_spell_icon!#P -15%#!" wc_suramar_events.1002.t:0 "The Great Mana Tree" wc_suramar_events.1002.desc:0 "As I walk into the tunnel connecting Meredil to Falanaar, I am almost blinded by the light of the Arcan'dor tree. Its roots are deep, and its branches are wide, and its mana flows through the air.\n\nThe Fal'dorei and the Withered alike are gathered around the tree, and they are in awe of its power. They are no longer cursed, and they are no longer twisted."