From bbc9d1ba161bfcc32e1e986d78311ccb20820ce4 Mon Sep 17 00:00:00 2001 From: Kayla Glick Date: Fri, 16 Feb 2024 15:01:29 -0500 Subject: [PATCH 1/2] add strength of wrynn 30% + raid sim buff --- sim/core/buffs.go | 6 +++--- ui/raid/settings_tab.ts | 11 ++++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/sim/core/buffs.go b/sim/core/buffs.go index 2d0cec754c..129cb47c5b 100644 --- a/sim/core/buffs.go +++ b/sim/core/buffs.go @@ -92,9 +92,9 @@ func applyBuffEffects(agent Agent, raidBuffs *proto.RaidBuffs, partyBuffs *proto } if raidBuffs.StrengthOfWrynn { - character.MultiplyStat(stats.Health, 1.25) - character.PseudoStats.DamageDealtMultiplier *= 1.25 - character.PseudoStats.HealingTakenMultiplier *= 1.25 + character.MultiplyStat(stats.Health, 1.30) + character.PseudoStats.DamageDealtMultiplier *= 1.30 + character.PseudoStats.HealingTakenMultiplier *= 1.30 } if raidBuffs.ArcaneEmpowerment || raidBuffs.FerociousInspiration || raidBuffs.SanctifiedRetribution { diff --git a/ui/raid/settings_tab.ts b/ui/raid/settings_tab.ts index 72be05296e..ca721a49dd 100644 --- a/ui/raid/settings_tab.ts +++ b/ui/raid/settings_tab.ts @@ -52,10 +52,10 @@ export class SettingsTab extends SimTab { protected buildTabContent() { this.buildEncounterSettings(); this.buildConsumesSettings(); - this.buildOtherSettings(); this.buildTankSettings(); this.buildAssignmentSettings(); + this.buildOtherSettings(); this.buildBlessingsPicker(); this.buildSavedDataPickers(); @@ -90,10 +90,11 @@ export class SettingsTab extends SimTab { } private buildOtherSettings() { - // const raid = this.simUI.sim.raid; - // const contentBlock = new ContentBlock(this.column1, 'other-settings', { - // header: {title: 'Other'} - // }); + const contentBlock = new ContentBlock(this.column2, 'other-settings', { + header: {title: 'Other'} + }); + + this.makeBooleanRaidIconBuffInput(contentBlock.bodyElement, ActionId.fromSpellId(73828), 'strengthOfWrynn'); // new BooleanPicker(contentBlock.bodyElement, this.simUI.sim.raid, { // label: 'Stagger Stormstrikes', From b24bd60acc91e790a80eb2d57527ab94871b6410 Mon Sep 17 00:00:00 2001 From: Kayla Glick Date: Fri, 16 Feb 2024 16:32:17 -0500 Subject: [PATCH 2/2] fix action id that was checked out --- ui/core/components/inputs/buffs_debuffs.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/core/components/inputs/buffs_debuffs.ts b/ui/core/components/inputs/buffs_debuffs.ts index e6f4d6e3d1..763e8f5483 100644 --- a/ui/core/components/inputs/buffs_debuffs.ts +++ b/ui/core/components/inputs/buffs_debuffs.ts @@ -166,7 +166,7 @@ export const StrengthAndAgilityBuff = InputHelpers.makeMultiIconInput([ ], 'Str/Agi'); // Misc Buffs -export const StrengthOfWrynn = makeBooleanRaidBuffInput({actionId: ActionId.fromSpellId(73827), fieldName: 'strengthOfWrynn'}); +export const StrengthOfWrynn = makeBooleanRaidBuffInput({actionId: ActionId.fromSpellId(73828), fieldName: 'strengthOfWrynn'}); export const RetributionAura = makeBooleanRaidBuffInput({actionId: ActionId.fromSpellId(54043), fieldName: 'retributionAura'}); export const BraidedEterniumChain = makeBooleanPartyBuffInput({actionId: ActionId.fromSpellId(31025), fieldName: 'braidedEterniumChain'}); export const ChainOfTheTwilightOwl = makeBooleanPartyBuffInput({actionId: ActionId.fromSpellId(31035), fieldName: 'chainOfTheTwilightOwl'});