From d22240a860f4f998f6de6337b4a1844b55f2c403 Mon Sep 17 00:00:00 2001 From: NerdEgghead Date: Thu, 7 Dec 2023 14:44:10 -0800 Subject: [PATCH] Added ICC 5% buff. Changes to be committed: modified: proto/common.proto modified: sim/core/buffs.go modified: ui/core/components/icon_inputs.ts modified: ui/core/components/individual_sim_ui/settings_tab.ts --- proto/common.proto | 1 + sim/core/buffs.go | 6 ++++++ ui/core/components/icon_inputs.ts | 1 + ui/core/components/individual_sim_ui/settings_tab.ts | 1 + 4 files changed, 9 insertions(+) diff --git a/proto/common.proto b/proto/common.proto index f125477886..8d48b909c1 100644 --- a/proto/common.proto +++ b/proto/common.proto @@ -464,6 +464,7 @@ message RaidBuffs { TristateEffect devotion_aura = 31; TristateEffect stoneskin_totem = 42; bool retribution_aura = 32; + bool strength_of_wrynn = 49; // Drums bool drums_of_forgotten_kings = 34; diff --git a/sim/core/buffs.go b/sim/core/buffs.go index ef084daac2..76957a3b53 100644 --- a/sim/core/buffs.go +++ b/sim/core/buffs.go @@ -91,6 +91,12 @@ func applyBuffEffects(agent Agent, raidBuffs *proto.RaidBuffs, partyBuffs *proto character.MultiplyStat(stats.RangedAttackPower, 1.1) } + if raidBuffs.StrengthOfWrynn { + character.MultiplyStat(stats.Health, 1.05) + character.PseudoStats.DamageDealtMultiplier *= 1.05 + character.PseudoStats.HealingTakenMultiplier *= 1.05 + } + if raidBuffs.ArcaneEmpowerment || raidBuffs.FerociousInspiration || raidBuffs.SanctifiedRetribution { character.PseudoStats.DamageDealtMultiplier *= 1.03 } diff --git a/ui/core/components/icon_inputs.ts b/ui/core/components/icon_inputs.ts index f2bf7c707e..7b8b3b157d 100644 --- a/ui/core/components/icon_inputs.ts +++ b/ui/core/components/icon_inputs.ts @@ -171,6 +171,7 @@ export const DefensiveCooldownBuff = InputHelpers.makeMultiIconInput([ ], 'Defensive CDs'); // Misc Buffs +export const StrengthOfWrynn = makeBooleanRaidBuffInput(ActionId.fromSpellId(73762), 'strengthOfWrynn'); export const RetributionAura = makeBooleanRaidBuffInput(ActionId.fromSpellId(54043), 'retributionAura'); export const BraidedEterniumChain = makeBooleanPartyBuffInput(ActionId.fromSpellId(31025), 'braidedEterniumChain'); export const ChainOfTheTwilightOwl = makeBooleanPartyBuffInput(ActionId.fromSpellId(31035), 'chainOfTheTwilightOwl'); diff --git a/ui/core/components/individual_sim_ui/settings_tab.ts b/ui/core/components/individual_sim_ui/settings_tab.ts index 73140508e1..f323474393 100644 --- a/ui/core/components/individual_sim_ui/settings_tab.ts +++ b/ui/core/components/individual_sim_ui/settings_tab.ts @@ -300,6 +300,7 @@ export class SettingsTab extends SimTab { } const miscBuffOptions = this.simUI.splitRelevantOptions([ + { item: IconInputs.StrengthOfWrynn, stats: [Stat.StatAttackPower, Stat.StatRangedAttackPower, Stat.StatSpellPower] }, { item: IconInputs.HeroicPresence, stats: [Stat.StatMeleeHit, Stat.StatSpellHit] }, { item: IconInputs.BraidedEterniumChain, stats: [Stat.StatMeleeCrit, Stat.StatSpellCrit] }, { item: IconInputs.ChainOfTheTwilightOwl, stats: [Stat.StatSpellCrit, Stat.StatMeleeCrit] },