From c36a214ac3d6126d04cf41d4fe0ebaff964029cb Mon Sep 17 00:00:00 2001 From: NerdEgghead Date: Sun, 26 Jan 2025 20:00:45 -0800 Subject: [PATCH 1/4] Added tentative P4 gear preset On branch feral Changes to be committed: modified: sim/druid/feral/TestFeral.results modified: sim/druid/feral/feral_test.go modified: ui/druid/feral/gear_sets/p4.gear.json modified: ui/druid/feral/presets.ts modified: ui/druid/feral/sim.ts --- sim/druid/feral/TestFeral.results | 504 ++++++++++++++++++++++++++ sim/druid/feral/feral_test.go | 1 + ui/druid/feral/gear_sets/p4.gear.json | 36 +- ui/druid/feral/presets.ts | 10 +- ui/druid/feral/sim.ts | 2 +- 5 files changed, 529 insertions(+), 24 deletions(-) diff --git a/sim/druid/feral/TestFeral.results b/sim/druid/feral/TestFeral.results index 28282db7a8..d6e8c34f4c 100644 --- a/sim/druid/feral/TestFeral.results +++ b/sim/druid/feral/TestFeral.results @@ -2348,6 +2348,258 @@ dps_results: { tps: 19067.31713 } } +dps_results: { + key: "TestFeral-Settings-Troll-p4-DefaultTalents-ExternalBleed-aoe-FullBuffs-25.0yards-LongMultiTarget" + value: { + dps: 115789.62354 + tps: 154670.40624 + } +} +dps_results: { + key: "TestFeral-Settings-Troll-p4-DefaultTalents-ExternalBleed-aoe-FullBuffs-25.0yards-LongSingleTarget" + value: { + dps: 29238.31113 + tps: 49890.25679 + } +} +dps_results: { + key: "TestFeral-Settings-Troll-p4-DefaultTalents-ExternalBleed-aoe-FullBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 33594.31933 + tps: 38266.73155 + } +} +dps_results: { + key: "TestFeral-Settings-Troll-p4-DefaultTalents-ExternalBleed-aoe-NoBuffs-25.0yards-LongMultiTarget" + value: { + dps: 82400.05511 + tps: 114444.40485 + } +} +dps_results: { + key: "TestFeral-Settings-Troll-p4-DefaultTalents-ExternalBleed-aoe-NoBuffs-25.0yards-LongSingleTarget" + value: { + dps: 18795.96311 + tps: 33096.90416 + } +} +dps_results: { + key: "TestFeral-Settings-Troll-p4-DefaultTalents-ExternalBleed-aoe-NoBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 18947.2369 + tps: 32117.84214 + } +} +dps_results: { + key: "TestFeral-Settings-Troll-p4-DefaultTalents-ExternalBleed-default-FullBuffs-25.0yards-LongMultiTarget" + value: { + dps: 50301.774 + tps: 69767.48913 + } +} +dps_results: { + key: "TestFeral-Settings-Troll-p4-DefaultTalents-ExternalBleed-default-FullBuffs-25.0yards-LongSingleTarget" + value: { + dps: 50092.94179 + tps: 72273.72847 + } +} +dps_results: { + key: "TestFeral-Settings-Troll-p4-DefaultTalents-ExternalBleed-default-FullBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 61089.6599 + tps: 62334.04004 + } +} +dps_results: { + key: "TestFeral-Settings-Troll-p4-DefaultTalents-ExternalBleed-default-NoBuffs-25.0yards-LongMultiTarget" + value: { + dps: 33216.02723 + tps: 48236.22325 + } +} +dps_results: { + key: "TestFeral-Settings-Troll-p4-DefaultTalents-ExternalBleed-default-NoBuffs-25.0yards-LongSingleTarget" + value: { + dps: 33482.67727 + tps: 49851.87499 + } +} +dps_results: { + key: "TestFeral-Settings-Troll-p4-DefaultTalents-ExternalBleed-default-NoBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 35949.6538 + tps: 40646.00405 + } +} +dps_results: { + key: "TestFeral-Settings-Troll-p4-DefaultTalents-ExternalBleed-monocat-FullBuffs-25.0yards-LongMultiTarget" + value: { + dps: 49093.2886 + tps: 34858.49554 + } +} +dps_results: { + key: "TestFeral-Settings-Troll-p4-DefaultTalents-ExternalBleed-monocat-FullBuffs-25.0yards-LongSingleTarget" + value: { + dps: 48672.88479 + tps: 34557.7482 + } +} +dps_results: { + key: "TestFeral-Settings-Troll-p4-DefaultTalents-ExternalBleed-monocat-FullBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 60011.47745 + tps: 42608.14899 + } +} +dps_results: { + key: "TestFeral-Settings-Troll-p4-DefaultTalents-ExternalBleed-monocat-NoBuffs-25.0yards-LongMultiTarget" + value: { + dps: 31939.46748 + tps: 22679.38479 + } +} +dps_results: { + key: "TestFeral-Settings-Troll-p4-DefaultTalents-ExternalBleed-monocat-NoBuffs-25.0yards-LongSingleTarget" + value: { + dps: 32181.0985 + tps: 22848.79009 + } +} +dps_results: { + key: "TestFeral-Settings-Troll-p4-DefaultTalents-ExternalBleed-monocat-NoBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 35336.63056 + tps: 25089.5757 + } +} +dps_results: { + key: "TestFeral-Settings-Troll-p4-HybridTalents-ExternalBleed-aoe-FullBuffs-25.0yards-LongMultiTarget" + value: { + dps: 114765.41298 + tps: 153688.31642 + } +} +dps_results: { + key: "TestFeral-Settings-Troll-p4-HybridTalents-ExternalBleed-aoe-FullBuffs-25.0yards-LongSingleTarget" + value: { + dps: 28939.49653 + tps: 48591.28904 + } +} +dps_results: { + key: "TestFeral-Settings-Troll-p4-HybridTalents-ExternalBleed-aoe-FullBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 33250.80162 + tps: 33503.70387 + } +} +dps_results: { + key: "TestFeral-Settings-Troll-p4-HybridTalents-ExternalBleed-aoe-NoBuffs-25.0yards-LongMultiTarget" + value: { + dps: 82213.07056 + tps: 114856.25231 + } +} +dps_results: { + key: "TestFeral-Settings-Troll-p4-HybridTalents-ExternalBleed-aoe-NoBuffs-25.0yards-LongSingleTarget" + value: { + dps: 18640.0233 + tps: 32812.74439 + } +} +dps_results: { + key: "TestFeral-Settings-Troll-p4-HybridTalents-ExternalBleed-aoe-NoBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 18655.04837 + tps: 32388.23263 + } +} +dps_results: { + key: "TestFeral-Settings-Troll-p4-HybridTalents-ExternalBleed-default-FullBuffs-25.0yards-LongMultiTarget" + value: { + dps: 49169.02867 + tps: 68909.02858 + } +} +dps_results: { + key: "TestFeral-Settings-Troll-p4-HybridTalents-ExternalBleed-default-FullBuffs-25.0yards-LongSingleTarget" + value: { + dps: 48875.53504 + tps: 70271.66195 + } +} +dps_results: { + key: "TestFeral-Settings-Troll-p4-HybridTalents-ExternalBleed-default-FullBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 59590.75 + tps: 60385.19744 + } +} +dps_results: { + key: "TestFeral-Settings-Troll-p4-HybridTalents-ExternalBleed-default-NoBuffs-25.0yards-LongMultiTarget" + value: { + dps: 32258.20991 + tps: 45925.35431 + } +} +dps_results: { + key: "TestFeral-Settings-Troll-p4-HybridTalents-ExternalBleed-default-NoBuffs-25.0yards-LongSingleTarget" + value: { + dps: 32309.72569 + tps: 47453.54219 + } +} +dps_results: { + key: "TestFeral-Settings-Troll-p4-HybridTalents-ExternalBleed-default-NoBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 34909.38842 + tps: 39005.54397 + } +} +dps_results: { + key: "TestFeral-Settings-Troll-p4-HybridTalents-ExternalBleed-monocat-FullBuffs-25.0yards-LongMultiTarget" + value: { + dps: 47928.7765 + tps: 34031.69195 + } +} +dps_results: { + key: "TestFeral-Settings-Troll-p4-HybridTalents-ExternalBleed-monocat-FullBuffs-25.0yards-LongSingleTarget" + value: { + dps: 47556.21995 + tps: 33764.91616 + } +} +dps_results: { + key: "TestFeral-Settings-Troll-p4-HybridTalents-ExternalBleed-monocat-FullBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 58612.5073 + tps: 41614.88019 + } +} +dps_results: { + key: "TestFeral-Settings-Troll-p4-HybridTalents-ExternalBleed-monocat-NoBuffs-25.0yards-LongMultiTarget" + value: { + dps: 31265.46742 + tps: 22200.84475 + } +} +dps_results: { + key: "TestFeral-Settings-Troll-p4-HybridTalents-ExternalBleed-monocat-NoBuffs-25.0yards-LongSingleTarget" + value: { + dps: 31253.05158 + tps: 22189.87678 + } +} +dps_results: { + key: "TestFeral-Settings-Troll-p4-HybridTalents-ExternalBleed-monocat-NoBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 34221.70324 + tps: 24297.9773 + } +} dps_results: { key: "TestFeral-Settings-Troll-preraid-DefaultTalents-ExternalBleed-aoe-FullBuffs-25.0yards-LongMultiTarget" value: { @@ -2852,6 +3104,258 @@ dps_results: { tps: 18778.49392 } } +dps_results: { + key: "TestFeral-Settings-Worgen-p4-DefaultTalents-ExternalBleed-aoe-FullBuffs-25.0yards-LongMultiTarget" + value: { + dps: 115611.48324 + tps: 155301.4367 + } +} +dps_results: { + key: "TestFeral-Settings-Worgen-p4-DefaultTalents-ExternalBleed-aoe-FullBuffs-25.0yards-LongSingleTarget" + value: { + dps: 29221.75169 + tps: 49342.16775 + } +} +dps_results: { + key: "TestFeral-Settings-Worgen-p4-DefaultTalents-ExternalBleed-aoe-FullBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 32933.21085 + tps: 37065.35491 + } +} +dps_results: { + key: "TestFeral-Settings-Worgen-p4-DefaultTalents-ExternalBleed-aoe-NoBuffs-25.0yards-LongMultiTarget" + value: { + dps: 82406.67359 + tps: 116121.27986 + } +} +dps_results: { + key: "TestFeral-Settings-Worgen-p4-DefaultTalents-ExternalBleed-aoe-NoBuffs-25.0yards-LongSingleTarget" + value: { + dps: 18731.58494 + tps: 33949.55629 + } +} +dps_results: { + key: "TestFeral-Settings-Worgen-p4-DefaultTalents-ExternalBleed-aoe-NoBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 18613.88603 + tps: 33529.93842 + } +} +dps_results: { + key: "TestFeral-Settings-Worgen-p4-DefaultTalents-ExternalBleed-default-FullBuffs-25.0yards-LongMultiTarget" + value: { + dps: 50110.80117 + tps: 70679.7838 + } +} +dps_results: { + key: "TestFeral-Settings-Worgen-p4-DefaultTalents-ExternalBleed-default-FullBuffs-25.0yards-LongSingleTarget" + value: { + dps: 49857.97122 + tps: 72510.67142 + } +} +dps_results: { + key: "TestFeral-Settings-Worgen-p4-DefaultTalents-ExternalBleed-default-FullBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 59723.26666 + tps: 61357.83827 + } +} +dps_results: { + key: "TestFeral-Settings-Worgen-p4-DefaultTalents-ExternalBleed-default-NoBuffs-25.0yards-LongMultiTarget" + value: { + dps: 33078.7536 + tps: 47399.23244 + } +} +dps_results: { + key: "TestFeral-Settings-Worgen-p4-DefaultTalents-ExternalBleed-default-NoBuffs-25.0yards-LongSingleTarget" + value: { + dps: 33283.42716 + tps: 49801.53075 + } +} +dps_results: { + key: "TestFeral-Settings-Worgen-p4-DefaultTalents-ExternalBleed-default-NoBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 35072.97853 + tps: 38425.00599 + } +} +dps_results: { + key: "TestFeral-Settings-Worgen-p4-DefaultTalents-ExternalBleed-monocat-FullBuffs-25.0yards-LongMultiTarget" + value: { + dps: 49154.64474 + tps: 34902.05841 + } +} +dps_results: { + key: "TestFeral-Settings-Worgen-p4-DefaultTalents-ExternalBleed-monocat-FullBuffs-25.0yards-LongSingleTarget" + value: { + dps: 48554.62686 + tps: 34473.78507 + } +} +dps_results: { + key: "TestFeral-Settings-Worgen-p4-DefaultTalents-ExternalBleed-monocat-FullBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 58944.75188 + tps: 41850.77383 + } +} +dps_results: { + key: "TestFeral-Settings-Worgen-p4-DefaultTalents-ExternalBleed-monocat-NoBuffs-25.0yards-LongMultiTarget" + value: { + dps: 31987.09834 + tps: 22713.2027 + } +} +dps_results: { + key: "TestFeral-Settings-Worgen-p4-DefaultTalents-ExternalBleed-monocat-NoBuffs-25.0yards-LongSingleTarget" + value: { + dps: 32054.5738 + tps: 22758.95756 + } +} +dps_results: { + key: "TestFeral-Settings-Worgen-p4-DefaultTalents-ExternalBleed-monocat-NoBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 34530.48659 + tps: 24517.21348 + } +} +dps_results: { + key: "TestFeral-Settings-Worgen-p4-HybridTalents-ExternalBleed-aoe-FullBuffs-25.0yards-LongMultiTarget" + value: { + dps: 114892.51864 + tps: 155195.7328 + } +} +dps_results: { + key: "TestFeral-Settings-Worgen-p4-HybridTalents-ExternalBleed-aoe-FullBuffs-25.0yards-LongSingleTarget" + value: { + dps: 28916.71882 + tps: 48455.55354 + } +} +dps_results: { + key: "TestFeral-Settings-Worgen-p4-HybridTalents-ExternalBleed-aoe-FullBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 32700.04981 + tps: 33104.71623 + } +} +dps_results: { + key: "TestFeral-Settings-Worgen-p4-HybridTalents-ExternalBleed-aoe-NoBuffs-25.0yards-LongMultiTarget" + value: { + dps: 82194.09683 + tps: 117423.8581 + } +} +dps_results: { + key: "TestFeral-Settings-Worgen-p4-HybridTalents-ExternalBleed-aoe-NoBuffs-25.0yards-LongSingleTarget" + value: { + dps: 18594.45913 + tps: 32787.82754 + } +} +dps_results: { + key: "TestFeral-Settings-Worgen-p4-HybridTalents-ExternalBleed-aoe-NoBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 18386.51862 + tps: 31757.23864 + } +} +dps_results: { + key: "TestFeral-Settings-Worgen-p4-HybridTalents-ExternalBleed-default-FullBuffs-25.0yards-LongMultiTarget" + value: { + dps: 49208.57369 + tps: 68111.06857 + } +} +dps_results: { + key: "TestFeral-Settings-Worgen-p4-HybridTalents-ExternalBleed-default-FullBuffs-25.0yards-LongSingleTarget" + value: { + dps: 48798.81782 + tps: 69009.62939 + } +} +dps_results: { + key: "TestFeral-Settings-Worgen-p4-HybridTalents-ExternalBleed-default-FullBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 58804.18445 + tps: 60332.76911 + } +} +dps_results: { + key: "TestFeral-Settings-Worgen-p4-HybridTalents-ExternalBleed-default-NoBuffs-25.0yards-LongMultiTarget" + value: { + dps: 32156.18895 + tps: 46290.15959 + } +} +dps_results: { + key: "TestFeral-Settings-Worgen-p4-HybridTalents-ExternalBleed-default-NoBuffs-25.0yards-LongSingleTarget" + value: { + dps: 32352.3741 + tps: 47136.07996 + } +} +dps_results: { + key: "TestFeral-Settings-Worgen-p4-HybridTalents-ExternalBleed-default-NoBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 34294.80644 + tps: 38122.62063 + } +} +dps_results: { + key: "TestFeral-Settings-Worgen-p4-HybridTalents-ExternalBleed-monocat-FullBuffs-25.0yards-LongMultiTarget" + value: { + dps: 47945.28464 + tps: 34043.41274 + } +} +dps_results: { + key: "TestFeral-Settings-Worgen-p4-HybridTalents-ExternalBleed-monocat-FullBuffs-25.0yards-LongSingleTarget" + value: { + dps: 47168.4529 + tps: 33489.60156 + } +} +dps_results: { + key: "TestFeral-Settings-Worgen-p4-HybridTalents-ExternalBleed-monocat-FullBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 57749.5778 + tps: 41002.20023 + } +} +dps_results: { + key: "TestFeral-Settings-Worgen-p4-HybridTalents-ExternalBleed-monocat-NoBuffs-25.0yards-LongMultiTarget" + value: { + dps: 31099.68404 + tps: 22083.13855 + } +} +dps_results: { + key: "TestFeral-Settings-Worgen-p4-HybridTalents-ExternalBleed-monocat-NoBuffs-25.0yards-LongSingleTarget" + value: { + dps: 31202.38757 + tps: 22153.90534 + } +} +dps_results: { + key: "TestFeral-Settings-Worgen-p4-HybridTalents-ExternalBleed-monocat-NoBuffs-25.0yards-ShortSingleTarget" + value: { + dps: 33685.33698 + tps: 23917.15725 + } +} dps_results: { key: "TestFeral-Settings-Worgen-preraid-DefaultTalents-ExternalBleed-aoe-FullBuffs-25.0yards-LongMultiTarget" value: { diff --git a/sim/druid/feral/feral_test.go b/sim/druid/feral/feral_test.go index dc133bcfaf..3046a33e2d 100644 --- a/sim/druid/feral/feral_test.go +++ b/sim/druid/feral/feral_test.go @@ -35,6 +35,7 @@ func TestFeral(t *testing.T) { OtherGearSets: []core.GearSetCombo{ core.GetGearSet("../../../ui/druid/feral/gear_sets", "p3"), + core.GetGearSet("../../../ui/druid/feral/gear_sets", "p4"), }, Talents: StandardTalents, diff --git a/ui/druid/feral/gear_sets/p4.gear.json b/ui/druid/feral/gear_sets/p4.gear.json index 15059a92d4..0740704cf6 100644 --- a/ui/druid/feral/gear_sets/p4.gear.json +++ b/ui/druid/feral/gear_sets/p4.gear.json @@ -1,19 +1,19 @@ {"items": [ - {"id":51296,"enchant":3817,"gems":[41398,40117]}, - {"id":50633,"gems":[40117]}, - {"id":51299,"enchant":3808,"gems":[40117]}, - {"id":47545,"enchant":3605,"gems":[40117]}, - {"id":51298,"enchant":3832,"gems":[40117,40125]}, - {"id":50670,"enchant":3845,"gems":[40125,0]}, - {"id":50675,"enchant":3604,"gems":[40162,40117,0]}, - {"id":50707,"gems":[40117,40117,40117]}, - {"id":51297,"enchant":3823,"gems":[40117,40162]}, - {"id":50607,"enchant":4223,"gems":[40143,40143]}, - {"id":50604,"gems":[40143]}, - {"id":50402,"gems":[40143]}, - {"id":50363}, - {"id":50343}, - {"id":50735,"enchant":3789,"gems":[40117,49110,40143]}, - {}, - {"id":50456} -]} \ No newline at end of file + {"id":78694,"enchant":4209,"gems":[68778,71879],"reforging":154}, + {"id":71610,"reforging":151}, + {"id":78368,"enchant":4204,"gems":[71879,71879],"reforging":151}, + {"id":71415,"enchant":1099,"gems":[71879,71879],"reforging":137}, + {"id":78665,"enchant":4102,"gems":[71879,71879,71852]}, + {"id":78446,"enchant":4258,"gems":[71879,0],"reforging":154}, + {"id":78684,"enchant":4107,"gems":[71879,0],"reforging":161}, + {"id":78388,"gems":[71879,71879,71879],"reforging":161}, + {"id":78713,"enchant":4126,"gems":[71879,71879,71862],"reforging":161}, + {"id":78462,"enchant":4076,"gems":[71879,71879],"reforging":161}, + {"id":78489,"gems":[71879],"reforging":158}, + {"id":78413,"gems":[71879],"reforging":154}, + {"id":77994}, + {"id":77999}, + {"id":78473,"enchant":4227}, + {}, + {"id":77080,"gems":[71879],"reforging":161} +]} diff --git a/ui/druid/feral/presets.ts b/ui/druid/feral/presets.ts index 3ec434b1e5..1118b15332 100644 --- a/ui/druid/feral/presets.ts +++ b/ui/druid/feral/presets.ts @@ -14,15 +14,15 @@ import { SavedTalents } from '../../core/proto/ui'; // Eventually we will import these values for the raid sim too, so its good to // keep them in a separate file. import PreraidGear from './gear_sets/preraid.gear.json'; -export const PRERAID_PRESET = PresetUtils.makePresetGear('Preraid Preset', PreraidGear); +export const PRERAID_PRESET = PresetUtils.makePresetGear('Pre-Raid', PreraidGear); import P1Gear from './gear_sets/p1.gear.json'; -export const P1_PRESET = PresetUtils.makePresetGear('P1 Preset', P1Gear); +export const P1_PRESET = PresetUtils.makePresetGear('P1', P1Gear); import P2Gear from './gear_sets/p2.gear.json'; -export const P2_PRESET = PresetUtils.makePresetGear('P2 Preset', P2Gear); +export const P2_PRESET = PresetUtils.makePresetGear('P2', P2Gear); import P3Gear from './gear_sets/p3.gear.json'; -export const P3_PRESET = PresetUtils.makePresetGear('P3 Preset', P3Gear); +export const P3_PRESET = PresetUtils.makePresetGear('P3', P3Gear); import P4Gear from './gear_sets/p4.gear.json'; -export const P4_PRESET = PresetUtils.makePresetGear('P4 Preset', P4Gear); +export const P4_PRESET = PresetUtils.makePresetGear('P4', P4Gear); import DefaultApl from './apls/default.apl.json'; export const APL_ROTATION_DEFAULT = PresetUtils.makePresetAPLRotation('APL Default', DefaultApl); diff --git a/ui/druid/feral/sim.ts b/ui/druid/feral/sim.ts index 86be795d1d..e35a4bc38d 100644 --- a/ui/druid/feral/sim.ts +++ b/ui/druid/feral/sim.ts @@ -121,7 +121,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecFeralDruid, { talents: [Presets.StandardTalents, Presets.HybridTalents], rotations: [Presets.SIMPLE_ROTATION_DEFAULT, Presets.AOE_ROTATION_DEFAULT], // Preset gear configurations that the user can quickly select. - gear: [Presets.PRERAID_PRESET, Presets.P1_PRESET, Presets.P3_PRESET], + gear: [Presets.PRERAID_PRESET, Presets.P1_PRESET, Presets.P3_PRESET, Presets.P4_PRESET], }, autoRotation: (_player: Player): APLRotation => { From ecec2d1c1e6d1dab15a39aa48359f20cae9cfc12 Mon Sep 17 00:00:00 2001 From: NerdEgghead Date: Sun, 26 Jan 2025 20:36:40 -0800 Subject: [PATCH 2/4] Implemented Guardian 2pT13 bonus On branch feral Changes to be committed: modified: sim/druid/balance/TestBalance.results modified: sim/druid/druid.go modified: sim/druid/feral/TestFeral.results modified: sim/druid/guardian/TestGuardian.results modified: sim/druid/items.go modified: sim/druid/savage_defense.go --- sim/druid/balance/TestBalance.results | 7 +++++++ sim/druid/druid.go | 1 + sim/druid/feral/TestFeral.results | 7 +++++++ sim/druid/guardian/TestGuardian.results | 8 ++++++++ sim/druid/items.go | 25 +++++++++++++++++++++++++ sim/druid/savage_defense.go | 7 ++++--- 6 files changed, 52 insertions(+), 3 deletions(-) diff --git a/sim/druid/balance/TestBalance.results b/sim/druid/balance/TestBalance.results index 6d471fd1bf..c96e7cc54a 100644 --- a/sim/druid/balance/TestBalance.results +++ b/sim/druid/balance/TestBalance.results @@ -435,6 +435,13 @@ dps_results: { tps: 26993.65922 } } +dps_results: { + key: "TestBalance-AllItems-DeepEarthBattlegarb" + value: { + dps: 19002.78454 + tps: 18986.08885 + } +} dps_results: { key: "TestBalance-AllItems-DeepEarthRegalia" value: { diff --git a/sim/druid/druid.go b/sim/druid/druid.go index 274363219a..c6927f91a7 100644 --- a/sim/druid/druid.go +++ b/sim/druid/druid.go @@ -100,6 +100,7 @@ type Druid struct { PredatoryInstinctsAura *core.Aura PrimalMadnessAura *core.Aura PulverizeAura *core.Aura + SavageDefenseAura *core.DamageAbsorptionAura SavageRoarAura *core.Aura SmokescreenAura *core.Aura SolarEclipseProcAura *core.Aura diff --git a/sim/druid/feral/TestFeral.results b/sim/druid/feral/TestFeral.results index d6e8c34f4c..7ebe23dda3 100644 --- a/sim/druid/feral/TestFeral.results +++ b/sim/druid/feral/TestFeral.results @@ -442,6 +442,13 @@ dps_results: { tps: 47058.12955 } } +dps_results: { + key: "TestFeral-AllItems-DeepEarthBattlegarb" + value: { + dps: 28993.29826 + tps: 42036.1711 + } +} dps_results: { key: "TestFeral-AllItems-DeepEarthRegalia" value: { diff --git a/sim/druid/guardian/TestGuardian.results b/sim/druid/guardian/TestGuardian.results index f06b70b387..48e48b13eb 100644 --- a/sim/druid/guardian/TestGuardian.results +++ b/sim/druid/guardian/TestGuardian.results @@ -499,6 +499,14 @@ dps_results: { hps: 319.10667 } } +dps_results: { + key: "TestGuardian-AllItems-DeepEarthBattlegarb" + value: { + dps: 10702.30575 + tps: 53582.93833 + hps: 320.53125 + } +} dps_results: { key: "TestGuardian-AllItems-DeepEarthRegalia" value: { diff --git a/sim/druid/items.go b/sim/druid/items.go index 984cd77f1b..3538cf1ee8 100644 --- a/sim/druid/items.go +++ b/sim/druid/items.go @@ -205,6 +205,31 @@ var ItemSetObsidianArborweaveRegalia = core.NewItemSet(core.ItemSet{ }, }) +// T13 Feral +var ItemSetDeepEarthBattlegarb = core.NewItemSet(core.ItemSet{ + Name: "Deep Earth Battlegarb", + Bonuses: map[int32]core.ApplySetBonus{ + 2: func(agent core.Agent, setBonusAura *core.Aura) { + druid := agent.(DruidAgent).GetDruid() + + if druid.InForm(Bear) { + setBonusAura.AttachProcTrigger(core.ProcTrigger{ + Name: "T13 Savage Defense Trigger", + Callback: core.CallbackOnSpellHitDealt, + ClassSpellMask: DruidSpellMangleBear, + Outcome: core.OutcomeCrit, + + Handler: func(sim *core.Simulation, _ *core.Spell, _ *core.SpellResult) { + if druid.PulverizeAura.IsActive() { + druid.SavageDefenseAura.Activate(sim) + } + }, + }) + } + }, + }, +}) + // T13 Balance var ItemSetDeepEarthRegalia = core.NewItemSet(core.ItemSet{ Name: "Deep Earth Regalia", diff --git a/sim/druid/savage_defense.go b/sim/druid/savage_defense.go index af861b3609..b95449cd38 100644 --- a/sim/druid/savage_defense.go +++ b/sim/druid/savage_defense.go @@ -12,7 +12,7 @@ func (druid *Druid) registerSavageDefensePassive() { return } - savageDefenseAura := druid.NewDamageAbsorptionAuraForSchool( + druid.SavageDefenseAura = druid.NewDamageAbsorptionAuraForSchool( "Savage Defense", core.ActionID{SpellID: 62606}, 10*time.Second, @@ -25,7 +25,8 @@ func (druid *Druid) registerSavageDefensePassive() { } return freshShieldStrength - }) + }, + ) core.MakeProcTriggerAura(&druid.Unit, core.ProcTrigger{ Name: "Savage Defense Trigger", @@ -35,7 +36,7 @@ func (druid *Druid) registerSavageDefensePassive() { Harmful: true, ProcChance: 0.5, Handler: func(sim *core.Simulation, _ *core.Spell, _ *core.SpellResult) { - savageDefenseAura.Activate(sim) + druid.SavageDefenseAura.Activate(sim) }, }) } From 4f1053b8ade7267eecc2cc6c29635da409a224bf Mon Sep 17 00:00:00 2001 From: NerdEgghead Date: Sun, 26 Jan 2025 21:43:48 -0800 Subject: [PATCH 3/4] Implemented Feral 2pT13 bonus On branch feral Changes to be committed: modified: sim/druid/feral/TestFeral.results modified: sim/druid/items.go --- sim/druid/feral/TestFeral.results | 100 +++++++++++++++--------------- sim/druid/items.go | 20 ++++++ 2 files changed, 70 insertions(+), 50 deletions(-) diff --git a/sim/druid/feral/TestFeral.results b/sim/druid/feral/TestFeral.results index 7ebe23dda3..70d67a1fbc 100644 --- a/sim/druid/feral/TestFeral.results +++ b/sim/druid/feral/TestFeral.results @@ -445,8 +445,8 @@ dps_results: { dps_results: { key: "TestFeral-AllItems-DeepEarthBattlegarb" value: { - dps: 28993.29826 - tps: 42036.1711 + dps: 29807.91959 + tps: 43211.02546 } } dps_results: { @@ -2400,85 +2400,85 @@ dps_results: { dps_results: { key: "TestFeral-Settings-Troll-p4-DefaultTalents-ExternalBleed-default-FullBuffs-25.0yards-LongMultiTarget" value: { - dps: 50301.774 - tps: 69767.48913 + dps: 51248.29116 + tps: 70786.8064 } } dps_results: { key: "TestFeral-Settings-Troll-p4-DefaultTalents-ExternalBleed-default-FullBuffs-25.0yards-LongSingleTarget" value: { - dps: 50092.94179 - tps: 72273.72847 + dps: 51129.5778 + tps: 72916.62807 } } dps_results: { key: "TestFeral-Settings-Troll-p4-DefaultTalents-ExternalBleed-default-FullBuffs-25.0yards-ShortSingleTarget" value: { - dps: 61089.6599 - tps: 62334.04004 + dps: 62526.36421 + tps: 66184.64207 } } dps_results: { key: "TestFeral-Settings-Troll-p4-DefaultTalents-ExternalBleed-default-NoBuffs-25.0yards-LongMultiTarget" value: { - dps: 33216.02723 - tps: 48236.22325 + dps: 33965.65188 + tps: 49632.93714 } } dps_results: { key: "TestFeral-Settings-Troll-p4-DefaultTalents-ExternalBleed-default-NoBuffs-25.0yards-LongSingleTarget" value: { - dps: 33482.67727 - tps: 49851.87499 + dps: 34217.42517 + tps: 50589.92424 } } dps_results: { key: "TestFeral-Settings-Troll-p4-DefaultTalents-ExternalBleed-default-NoBuffs-25.0yards-ShortSingleTarget" value: { - dps: 35949.6538 - tps: 40646.00405 + dps: 36866.238 + tps: 40794.31716 } } dps_results: { key: "TestFeral-Settings-Troll-p4-DefaultTalents-ExternalBleed-monocat-FullBuffs-25.0yards-LongMultiTarget" value: { - dps: 49093.2886 - tps: 34858.49554 + dps: 50216.34435 + tps: 35655.86513 } } dps_results: { key: "TestFeral-Settings-Troll-p4-DefaultTalents-ExternalBleed-monocat-FullBuffs-25.0yards-LongSingleTarget" value: { - dps: 48672.88479 - tps: 34557.7482 + dps: 49957.94185 + tps: 35470.13871 } } dps_results: { key: "TestFeral-Settings-Troll-p4-DefaultTalents-ExternalBleed-monocat-FullBuffs-25.0yards-ShortSingleTarget" value: { - dps: 60011.47745 - tps: 42608.14899 + dps: 60937.26645 + tps: 43265.45918 } } dps_results: { key: "TestFeral-Settings-Troll-p4-DefaultTalents-ExternalBleed-monocat-NoBuffs-25.0yards-LongMultiTarget" value: { - dps: 31939.46748 - tps: 22679.38479 + dps: 32750.38805 + tps: 23255.13839 } } dps_results: { key: "TestFeral-Settings-Troll-p4-DefaultTalents-ExternalBleed-monocat-NoBuffs-25.0yards-LongSingleTarget" value: { - dps: 32181.0985 - tps: 22848.79009 + dps: 32899.08423 + tps: 23358.55996 } } dps_results: { key: "TestFeral-Settings-Troll-p4-DefaultTalents-ExternalBleed-monocat-NoBuffs-25.0yards-ShortSingleTarget" value: { - dps: 35336.63056 - tps: 25089.5757 + dps: 36239.19024 + tps: 25730.39307 } } dps_results: { @@ -3156,85 +3156,85 @@ dps_results: { dps_results: { key: "TestFeral-Settings-Worgen-p4-DefaultTalents-ExternalBleed-default-FullBuffs-25.0yards-LongMultiTarget" value: { - dps: 50110.80117 - tps: 70679.7838 + dps: 51169.78762 + tps: 71186.4075 } } dps_results: { key: "TestFeral-Settings-Worgen-p4-DefaultTalents-ExternalBleed-default-FullBuffs-25.0yards-LongSingleTarget" value: { - dps: 49857.97122 - tps: 72510.67142 + dps: 51257.0686 + tps: 73398.9518 } } dps_results: { key: "TestFeral-Settings-Worgen-p4-DefaultTalents-ExternalBleed-default-FullBuffs-25.0yards-ShortSingleTarget" value: { - dps: 59723.26666 - tps: 61357.83827 + dps: 61758.30365 + tps: 64064.16526 } } dps_results: { key: "TestFeral-Settings-Worgen-p4-DefaultTalents-ExternalBleed-default-NoBuffs-25.0yards-LongMultiTarget" value: { - dps: 33078.7536 - tps: 47399.23244 + dps: 33771.53968 + tps: 48552.74209 } } dps_results: { key: "TestFeral-Settings-Worgen-p4-DefaultTalents-ExternalBleed-default-NoBuffs-25.0yards-LongSingleTarget" value: { - dps: 33283.42716 - tps: 49801.53075 + dps: 33946.55923 + tps: 51481.27615 } } dps_results: { key: "TestFeral-Settings-Worgen-p4-DefaultTalents-ExternalBleed-default-NoBuffs-25.0yards-ShortSingleTarget" value: { - dps: 35072.97853 - tps: 38425.00599 + dps: 36327.04315 + tps: 42005.80061 } } dps_results: { key: "TestFeral-Settings-Worgen-p4-DefaultTalents-ExternalBleed-monocat-FullBuffs-25.0yards-LongMultiTarget" value: { - dps: 49154.64474 - tps: 34902.05841 + dps: 50278.13925 + tps: 35699.73951 } } dps_results: { key: "TestFeral-Settings-Worgen-p4-DefaultTalents-ExternalBleed-monocat-FullBuffs-25.0yards-LongSingleTarget" value: { - dps: 48554.62686 - tps: 34473.78507 + dps: 49692.87419 + tps: 35281.94067 } } dps_results: { key: "TestFeral-Settings-Worgen-p4-DefaultTalents-ExternalBleed-monocat-FullBuffs-25.0yards-ShortSingleTarget" value: { - dps: 58944.75188 - tps: 41850.77383 + dps: 60248.34836 + tps: 42776.32733 } } dps_results: { key: "TestFeral-Settings-Worgen-p4-DefaultTalents-ExternalBleed-monocat-NoBuffs-25.0yards-LongMultiTarget" value: { - dps: 31987.09834 - tps: 22713.2027 + dps: 32634.25284 + tps: 23172.68239 } } dps_results: { key: "TestFeral-Settings-Worgen-p4-DefaultTalents-ExternalBleed-monocat-NoBuffs-25.0yards-LongSingleTarget" value: { - dps: 32054.5738 - tps: 22758.95756 + dps: 32792.8148 + tps: 23283.10867 } } dps_results: { key: "TestFeral-Settings-Worgen-p4-DefaultTalents-ExternalBleed-monocat-NoBuffs-25.0yards-ShortSingleTarget" value: { - dps: 34530.48659 - tps: 24517.21348 + dps: 35589.31782 + tps: 25268.98365 } } dps_results: { diff --git a/sim/druid/items.go b/sim/druid/items.go index 3538cf1ee8..e595eef8df 100644 --- a/sim/druid/items.go +++ b/sim/druid/items.go @@ -226,6 +226,26 @@ var ItemSetDeepEarthBattlegarb = core.NewItemSet(core.ItemSet{ }, }) } + + if !druid.InForm(Cat) { + return + } + + // Rather than creating a whole extra Execute phase category just for this bonus, we will instead scale up ExecuteProportion_25 using linear interpolation. Note that we use ExecuteProportion_90 for Predatory Strikes (< 80%), which is why the math below looks funny. + oldExecuteProportion_25 := druid.Env.Encounter.ExecuteProportion_25 + oldExecuteProportion_35 := druid.Env.Encounter.ExecuteProportion_35 + newExecuteProportion_25 := oldExecuteProportion_35 * (1.0 - (60.0 - 35.0) / (80.0 - 35.0)) + druid.Env.Encounter.ExecuteProportion_90 * ((60.0 - 35.0) / (80.0 - 35.0)) + newExecuteProportion_35 := 0.5 * (newExecuteProportion_25 + druid.Env.Encounter.ExecuteProportion_90) // We don't use this field anywhere, just need it to be any value above ExecuteProportion_25 but below ExecuteProportion_90 so that the transitions work properly. + + setBonusAura.ApplyOnGain(func(_ *core.Aura, _ *core.Simulation) { + druid.Env.Encounter.ExecuteProportion_35 = newExecuteProportion_35 + druid.Env.Encounter.ExecuteProportion_25 = newExecuteProportion_25 + }) + + setBonusAura.ApplyOnExpire(func(_ *core.Aura, _ *core.Simulation) { + druid.Env.Encounter.ExecuteProportion_25 = oldExecuteProportion_25 + druid.Env.Encounter.ExecuteProportion_35 = oldExecuteProportion_35 + }) }, }, }) From 6d4897c497f1b77bc321aeea4c0dc6ddc92b1de2 Mon Sep 17 00:00:00 2001 From: NerdEgghead Date: Sun, 26 Jan 2025 22:11:07 -0800 Subject: [PATCH 4/4] Implemented cat 4pT13 bonus On branch feral Changes to be committed: modified: sim/druid/druid.go modified: sim/druid/feral/TestFeral.results modified: sim/druid/items.go modified: sim/druid/tigers_fury.go modified: ui/core/constants/item_notices.tsx --- sim/druid/druid.go | 1 + sim/druid/feral/TestFeral.results | 196 ++++++++++++++--------------- sim/druid/items.go | 5 + sim/druid/tigers_fury.go | 5 +- ui/core/constants/item_notices.tsx | 1 - 5 files changed, 108 insertions(+), 100 deletions(-) diff --git a/sim/druid/druid.go b/sim/druid/druid.go index c6927f91a7..0f3d72805c 100644 --- a/sim/druid/druid.go +++ b/sim/druid/druid.go @@ -133,6 +133,7 @@ type Druid struct { T11Feral2pBonus *core.Aura T11Feral4pBonus *core.Aura T12Feral4pBonus *core.Aura + T13Feral4pBonus *core.Aura } const ( diff --git a/sim/druid/feral/TestFeral.results b/sim/druid/feral/TestFeral.results index 70d67a1fbc..d382cf9ad7 100644 --- a/sim/druid/feral/TestFeral.results +++ b/sim/druid/feral/TestFeral.results @@ -445,8 +445,8 @@ dps_results: { dps_results: { key: "TestFeral-AllItems-DeepEarthBattlegarb" value: { - dps: 29807.91959 - tps: 43211.02546 + dps: 30572.2003 + tps: 41569.421 } } dps_results: { @@ -2400,85 +2400,85 @@ dps_results: { dps_results: { key: "TestFeral-Settings-Troll-p4-DefaultTalents-ExternalBleed-default-FullBuffs-25.0yards-LongMultiTarget" value: { - dps: 51248.29116 - tps: 70786.8064 + dps: 52708.15354 + tps: 66500.82463 } } dps_results: { key: "TestFeral-Settings-Troll-p4-DefaultTalents-ExternalBleed-default-FullBuffs-25.0yards-LongSingleTarget" value: { - dps: 51129.5778 - tps: 72916.62807 + dps: 52494.6605 + tps: 71262.50895 } } dps_results: { key: "TestFeral-Settings-Troll-p4-DefaultTalents-ExternalBleed-default-FullBuffs-25.0yards-ShortSingleTarget" value: { - dps: 62526.36421 - tps: 66184.64207 + dps: 63878.37561 + tps: 63532.48492 } } dps_results: { key: "TestFeral-Settings-Troll-p4-DefaultTalents-ExternalBleed-default-NoBuffs-25.0yards-LongMultiTarget" value: { - dps: 33965.65188 - tps: 49632.93714 + dps: 34540.81702 + tps: 46436.03134 } } dps_results: { key: "TestFeral-Settings-Troll-p4-DefaultTalents-ExternalBleed-default-NoBuffs-25.0yards-LongSingleTarget" value: { - dps: 34217.42517 - tps: 50589.92424 + dps: 35242.41891 + tps: 49325.0399 } } dps_results: { key: "TestFeral-Settings-Troll-p4-DefaultTalents-ExternalBleed-default-NoBuffs-25.0yards-ShortSingleTarget" value: { - dps: 36866.238 - tps: 40794.31716 + dps: 37681.65634 + tps: 40639.15558 } } dps_results: { key: "TestFeral-Settings-Troll-p4-DefaultTalents-ExternalBleed-monocat-FullBuffs-25.0yards-LongMultiTarget" value: { - dps: 50216.34435 - tps: 35655.86513 + dps: 51463.20449 + tps: 36541.13583 } } dps_results: { key: "TestFeral-Settings-Troll-p4-DefaultTalents-ExternalBleed-monocat-FullBuffs-25.0yards-LongSingleTarget" value: { - dps: 49957.94185 - tps: 35470.13871 + dps: 51208.59715 + tps: 36358.10398 } } dps_results: { key: "TestFeral-Settings-Troll-p4-DefaultTalents-ExternalBleed-monocat-FullBuffs-25.0yards-ShortSingleTarget" value: { - dps: 60937.26645 - tps: 43265.45918 + dps: 62608.51781 + tps: 44452.04765 } } dps_results: { key: "TestFeral-Settings-Troll-p4-DefaultTalents-ExternalBleed-monocat-NoBuffs-25.0yards-LongMultiTarget" value: { - dps: 32750.38805 - tps: 23255.13839 + dps: 33615.76593 + tps: 23869.55669 } } dps_results: { key: "TestFeral-Settings-Troll-p4-DefaultTalents-ExternalBleed-monocat-NoBuffs-25.0yards-LongSingleTarget" value: { - dps: 32899.08423 - tps: 23358.55996 + dps: 33860.35865 + tps: 24041.0648 } } dps_results: { key: "TestFeral-Settings-Troll-p4-DefaultTalents-ExternalBleed-monocat-NoBuffs-25.0yards-ShortSingleTarget" value: { - dps: 36239.19024 - tps: 25730.39307 + dps: 37065.83317 + tps: 26317.30955 } } dps_results: { @@ -2526,85 +2526,85 @@ dps_results: { dps_results: { key: "TestFeral-Settings-Troll-p4-HybridTalents-ExternalBleed-default-FullBuffs-25.0yards-LongMultiTarget" value: { - dps: 49169.02867 - tps: 68909.02858 + dps: 50539.0743 + tps: 66929.97943 } } dps_results: { key: "TestFeral-Settings-Troll-p4-HybridTalents-ExternalBleed-default-FullBuffs-25.0yards-LongSingleTarget" value: { - dps: 48875.53504 - tps: 70271.66195 + dps: 49881.61203 + tps: 66910.80545 } } dps_results: { key: "TestFeral-Settings-Troll-p4-HybridTalents-ExternalBleed-default-FullBuffs-25.0yards-ShortSingleTarget" value: { - dps: 59590.75 - tps: 60385.19744 + dps: 60829.52554 + tps: 59779.35738 } } dps_results: { key: "TestFeral-Settings-Troll-p4-HybridTalents-ExternalBleed-default-NoBuffs-25.0yards-LongMultiTarget" value: { - dps: 32258.20991 - tps: 45925.35431 + dps: 33079.31708 + tps: 44042.34749 } } dps_results: { key: "TestFeral-Settings-Troll-p4-HybridTalents-ExternalBleed-default-NoBuffs-25.0yards-LongSingleTarget" value: { - dps: 32309.72569 - tps: 47453.54219 + dps: 33323.69567 + tps: 45719.79033 } } dps_results: { key: "TestFeral-Settings-Troll-p4-HybridTalents-ExternalBleed-default-NoBuffs-25.0yards-ShortSingleTarget" value: { - dps: 34909.38842 - tps: 39005.54397 + dps: 35448.24466 + tps: 35921.25105 } } dps_results: { key: "TestFeral-Settings-Troll-p4-HybridTalents-ExternalBleed-monocat-FullBuffs-25.0yards-LongMultiTarget" value: { - dps: 47928.7765 - tps: 34031.69195 + dps: 49314.58672 + tps: 35015.61721 } } dps_results: { key: "TestFeral-Settings-Troll-p4-HybridTalents-ExternalBleed-monocat-FullBuffs-25.0yards-LongSingleTarget" value: { - dps: 47556.21995 - tps: 33764.91616 + dps: 48742.90254 + tps: 34607.4608 } } dps_results: { key: "TestFeral-Settings-Troll-p4-HybridTalents-ExternalBleed-monocat-FullBuffs-25.0yards-ShortSingleTarget" value: { - dps: 58612.5073 - tps: 41614.88019 + dps: 59714.89125 + tps: 42397.57279 } } dps_results: { key: "TestFeral-Settings-Troll-p4-HybridTalents-ExternalBleed-monocat-NoBuffs-25.0yards-LongMultiTarget" value: { - dps: 31265.46742 - tps: 22200.84475 + dps: 32087.00228 + tps: 22784.1345 } } dps_results: { key: "TestFeral-Settings-Troll-p4-HybridTalents-ExternalBleed-monocat-NoBuffs-25.0yards-LongSingleTarget" value: { - dps: 31253.05158 - tps: 22189.87678 + dps: 32292.44648 + tps: 22927.84716 } } dps_results: { key: "TestFeral-Settings-Troll-p4-HybridTalents-ExternalBleed-monocat-NoBuffs-25.0yards-ShortSingleTarget" value: { - dps: 34221.70324 - tps: 24297.9773 + dps: 34989.57504 + tps: 24843.16628 } } dps_results: { @@ -3156,85 +3156,85 @@ dps_results: { dps_results: { key: "TestFeral-Settings-Worgen-p4-DefaultTalents-ExternalBleed-default-FullBuffs-25.0yards-LongMultiTarget" value: { - dps: 51169.78762 - tps: 71186.4075 + dps: 52636.56318 + tps: 68192.65788 } } dps_results: { key: "TestFeral-Settings-Worgen-p4-DefaultTalents-ExternalBleed-default-FullBuffs-25.0yards-LongSingleTarget" value: { - dps: 51257.0686 - tps: 73398.9518 + dps: 52707.90636 + tps: 71920.67318 } } dps_results: { key: "TestFeral-Settings-Worgen-p4-DefaultTalents-ExternalBleed-default-FullBuffs-25.0yards-ShortSingleTarget" value: { - dps: 61758.30365 - tps: 64064.16526 + dps: 62531.59532 + tps: 63485.34063 } } dps_results: { key: "TestFeral-Settings-Worgen-p4-DefaultTalents-ExternalBleed-default-NoBuffs-25.0yards-LongMultiTarget" value: { - dps: 33771.53968 - tps: 48552.74209 + dps: 34618.28196 + tps: 46400.21296 } } dps_results: { key: "TestFeral-Settings-Worgen-p4-DefaultTalents-ExternalBleed-default-NoBuffs-25.0yards-LongSingleTarget" value: { - dps: 33946.55923 - tps: 51481.27615 + dps: 34994.87293 + tps: 48029.1255 } } dps_results: { key: "TestFeral-Settings-Worgen-p4-DefaultTalents-ExternalBleed-default-NoBuffs-25.0yards-ShortSingleTarget" value: { - dps: 36327.04315 - tps: 42005.80061 + dps: 37211.72126 + tps: 39857.76315 } } dps_results: { key: "TestFeral-Settings-Worgen-p4-DefaultTalents-ExternalBleed-monocat-FullBuffs-25.0yards-LongMultiTarget" value: { - dps: 50278.13925 - tps: 35699.73951 + dps: 51703.71306 + tps: 36711.89692 } } dps_results: { key: "TestFeral-Settings-Worgen-p4-DefaultTalents-ExternalBleed-monocat-FullBuffs-25.0yards-LongSingleTarget" value: { - dps: 49692.87419 - tps: 35281.94067 + dps: 51211.02339 + tps: 36359.82661 } } dps_results: { key: "TestFeral-Settings-Worgen-p4-DefaultTalents-ExternalBleed-monocat-FullBuffs-25.0yards-ShortSingleTarget" value: { - dps: 60248.34836 - tps: 42776.32733 + dps: 61342.92323 + tps: 43553.47549 } } dps_results: { key: "TestFeral-Settings-Worgen-p4-DefaultTalents-ExternalBleed-monocat-NoBuffs-25.0yards-LongMultiTarget" value: { - dps: 32634.25284 - tps: 23172.68239 + dps: 33537.86192 + tps: 23814.24484 } } dps_results: { key: "TestFeral-Settings-Worgen-p4-DefaultTalents-ExternalBleed-monocat-NoBuffs-25.0yards-LongSingleTarget" value: { - dps: 32792.8148 - tps: 23283.10867 + dps: 33785.28351 + tps: 23987.76145 } } dps_results: { key: "TestFeral-Settings-Worgen-p4-DefaultTalents-ExternalBleed-monocat-NoBuffs-25.0yards-ShortSingleTarget" value: { - dps: 35589.31782 - tps: 25268.98365 + dps: 36290.34039 + tps: 25766.70968 } } dps_results: { @@ -3282,85 +3282,85 @@ dps_results: { dps_results: { key: "TestFeral-Settings-Worgen-p4-HybridTalents-ExternalBleed-default-FullBuffs-25.0yards-LongMultiTarget" value: { - dps: 49208.57369 - tps: 68111.06857 + dps: 50217.18694 + tps: 66386.01585 } } dps_results: { key: "TestFeral-Settings-Worgen-p4-HybridTalents-ExternalBleed-default-FullBuffs-25.0yards-LongSingleTarget" value: { - dps: 48798.81782 - tps: 69009.62939 + dps: 49893.95074 + tps: 66726.67733 } } dps_results: { key: "TestFeral-Settings-Worgen-p4-HybridTalents-ExternalBleed-default-FullBuffs-25.0yards-ShortSingleTarget" value: { - dps: 58804.18445 - tps: 60332.76911 + dps: 59596.0328 + tps: 58069.13407 } } dps_results: { key: "TestFeral-Settings-Worgen-p4-HybridTalents-ExternalBleed-default-NoBuffs-25.0yards-LongMultiTarget" value: { - dps: 32156.18895 - tps: 46290.15959 + dps: 33183.60494 + tps: 43374.7111 } } dps_results: { key: "TestFeral-Settings-Worgen-p4-HybridTalents-ExternalBleed-default-NoBuffs-25.0yards-LongSingleTarget" value: { - dps: 32352.3741 - tps: 47136.07996 + dps: 33282.98591 + tps: 46226.91397 } } dps_results: { key: "TestFeral-Settings-Worgen-p4-HybridTalents-ExternalBleed-default-NoBuffs-25.0yards-ShortSingleTarget" value: { - dps: 34294.80644 - tps: 38122.62063 + dps: 34725.46449 + tps: 36555.59414 } } dps_results: { key: "TestFeral-Settings-Worgen-p4-HybridTalents-ExternalBleed-monocat-FullBuffs-25.0yards-LongMultiTarget" value: { - dps: 47945.28464 - tps: 34043.41274 + dps: 49096.21232 + tps: 34860.57139 } } dps_results: { key: "TestFeral-Settings-Worgen-p4-HybridTalents-ExternalBleed-monocat-FullBuffs-25.0yards-LongSingleTarget" value: { - dps: 47168.4529 - tps: 33489.60156 + dps: 48607.08492 + tps: 34511.03029 } } dps_results: { key: "TestFeral-Settings-Worgen-p4-HybridTalents-ExternalBleed-monocat-FullBuffs-25.0yards-ShortSingleTarget" value: { - dps: 57749.5778 - tps: 41002.20023 + dps: 58767.7694 + tps: 41725.11628 } } dps_results: { key: "TestFeral-Settings-Worgen-p4-HybridTalents-ExternalBleed-monocat-NoBuffs-25.0yards-LongMultiTarget" value: { - dps: 31099.68404 - tps: 22083.13855 + dps: 32045.88044 + tps: 22754.93799 } } dps_results: { key: "TestFeral-Settings-Worgen-p4-HybridTalents-ExternalBleed-monocat-NoBuffs-25.0yards-LongSingleTarget" value: { - dps: 31202.38757 - tps: 22153.90534 + dps: 32089.80336 + tps: 22783.97054 } } dps_results: { key: "TestFeral-Settings-Worgen-p4-HybridTalents-ExternalBleed-monocat-NoBuffs-25.0yards-ShortSingleTarget" value: { - dps: 33685.33698 - tps: 23917.15725 + dps: 34179.07709 + tps: 24267.71274 } } dps_results: { diff --git a/sim/druid/items.go b/sim/druid/items.go index e595eef8df..e9f7c26923 100644 --- a/sim/druid/items.go +++ b/sim/druid/items.go @@ -247,6 +247,11 @@ var ItemSetDeepEarthBattlegarb = core.NewItemSet(core.ItemSet{ druid.Env.Encounter.ExecuteProportion_35 = oldExecuteProportion_35 }) }, + 4: func(agent core.Agent, setBonusAura *core.Aura) { + // Implemented in tigers_fury.go + druid := agent.(DruidAgent).GetDruid() + druid.T13Feral4pBonus = setBonusAura + }, }, }) diff --git a/sim/druid/tigers_fury.go b/sim/druid/tigers_fury.go index 1bde2cf6f0..1da14d946f 100644 --- a/sim/druid/tigers_fury.go +++ b/sim/druid/tigers_fury.go @@ -49,8 +49,11 @@ func (druid *Druid) registerTigersFurySpell() { ApplyEffects: func(sim *core.Simulation, _ *core.Unit, _ *core.Spell) { druid.AddEnergy(sim, instantEnergy, energyMetrics) - druid.TigersFuryAura.Activate(sim) + + if (druid.StampedeCatAura != nil) && druid.T13Feral4pBonus.IsActive() { + druid.StampedeCatAura.Activate(sim) + } }, }) diff --git a/ui/core/constants/item_notices.tsx b/ui/core/constants/item_notices.tsx index 58b8b57aa7..922ab4dcf5 100644 --- a/ui/core/constants/item_notices.tsx +++ b/ui/core/constants/item_notices.tsx @@ -159,7 +159,6 @@ export const SET_BONUS_NOTICES = new Map([ [1014, null], // Resto Shaman T12 [1056, null], // Blood DK T13 - [1058, null], // Feral Druid T13 [1060, null], // Resto Druid T13 [1066, null], // Healing Priest T13 [1067, null], // Shadow Priest T13