From 38083bb9992671a5ac38e430b536fd430c94703e Mon Sep 17 00:00:00 2001 From: Kayla Glick Date: Mon, 13 Jan 2025 18:08:21 -0500 Subject: [PATCH] fix enhancement test, totem state leak --- sim/shaman/air_totems.go | 1 + sim/shaman/elemental/TestElemental.results | 86 +++--- .../enhancement/TestEnhancement.results | 277 +++++++++++------- sim/shaman/enhancement/enhancement_test.go | 2 +- sim/shaman/shaman.go | 4 +- .../gear_sets/phase_1.gear.json | 2 +- 6 files changed, 219 insertions(+), 153 deletions(-) diff --git a/sim/shaman/air_totems.go b/sim/shaman/air_totems.go index c97f9a6b7..7fecf5b73 100644 --- a/sim/shaman/air_totems.go +++ b/sim/shaman/air_totems.go @@ -73,6 +73,7 @@ func (shaman *Shaman) newWindfuryTotemSpellConfig(rank int) core.SpellConfig { }, OnExpire: func(_ *core.Aura, sim *core.Simulation) { shaman.ActiveWindfuryTotemPeriodicAction.Cancel(sim) + shaman.ActiveWindfuryTotemPeriodicAction = nil }, }) diff --git a/sim/shaman/elemental/TestElemental.results b/sim/shaman/elemental/TestElemental.results index d5188639f..d8e1ce72d 100644 --- a/sim/shaman/elemental/TestElemental.results +++ b/sim/shaman/elemental/TestElemental.results @@ -3,10 +3,10 @@ character_stats_results: { value: { final_stats: 219.65 final_stats: 194.35 - final_stats: 452.295 - final_stats: 317.4 + final_stats: 457.585 + final_stats: 318.55 final_stats: 228.85 - final_stats: 518 + final_stats: 507 final_stats: 0 final_stats: 40 final_stats: 0 @@ -14,8 +14,8 @@ character_stats_results: { final_stats: 61 final_stats: 0 final_stats: 54.25 - final_stats: 5 - final_stats: 32.66406 + final_stats: 6 + final_stats: 32.6835 final_stats: 0 final_stats: 0 final_stats: 1220.3 @@ -24,10 +24,10 @@ character_stats_results: { final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 6001 + final_stats: 6018.25 final_stats: 0 final_stats: 0 - final_stats: 1815.7 + final_stats: 1975.7 final_stats: 440 final_stats: 0 final_stats: 5 @@ -35,7 +35,7 @@ character_stats_results: { final_stats: 11.57298 final_stats: 5 final_stats: 0 - final_stats: 6065.95 + final_stats: 6118.85 final_stats: 33 final_stats: 91 final_stats: 66 @@ -298,18 +298,18 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.37458 + weights: 0.22502 weights: 0 - weights: 0.61768 + weights: 0.62531 weights: 0 weights: 0 weights: 0 weights: 0 - weights: 0.61768 + weights: 0.62531 weights: 0 weights: 0 - weights: 7.55828 - weights: 3.99359 + weights: 7.67845 + weights: 3.98613 weights: 0 weights: 0 weights: 0 @@ -603,8 +603,8 @@ dps_results: { dps_results: { key: "TestElemental-Phase1-AllItems-GiftoftheGatheringStorm" value: { - dps: 598.25405 - tps: 619.64398 + dps: 596.31059 + tps: 617.77426 } } dps_results: { @@ -652,99 +652,99 @@ dps_results: { dps_results: { key: "TestElemental-Phase1-Average-Default" value: { - dps: 616.28663 - tps: 637.8357 + dps: 616.53667 + tps: 638.15691 } } dps_results: { key: "TestElemental-Phase1-Settings-Orc-phase_1-Adaptive-default-FullBuffs-P1-Consumes-LongMultiTarget" value: { - dps: 698.51608 - tps: 1116.625 + dps: 696.31494 + tps: 1116.48885 } } dps_results: { key: "TestElemental-Phase1-Settings-Orc-phase_1-Adaptive-default-FullBuffs-P1-Consumes-LongSingleTarget" value: { - dps: 588.30081 - tps: 609.28663 + dps: 588.15198 + tps: 609.20171 } } dps_results: { key: "TestElemental-Phase1-Settings-Orc-phase_1-Adaptive-default-FullBuffs-P1-Consumes-ShortSingleTarget" value: { - dps: 684.50201 - tps: 715.75092 + dps: 685.84137 + tps: 717.11486 } } dps_results: { key: "TestElemental-Phase1-Settings-Orc-phase_1-Adaptive-default-NoBuffs-P1-Consumes-LongMultiTarget" value: { - dps: 387.04255 - tps: 682.92313 + dps: 389.41357 + tps: 685.29416 } } dps_results: { key: "TestElemental-Phase1-Settings-Orc-phase_1-Adaptive-default-NoBuffs-P1-Consumes-LongSingleTarget" value: { - dps: 346.80842 - tps: 361.60245 + dps: 347.26395 + tps: 362.05798 } } dps_results: { key: "TestElemental-Phase1-Settings-Orc-phase_1-Adaptive-default-NoBuffs-P1-Consumes-ShortSingleTarget" value: { - dps: 522.58984 - tps: 547.74208 + dps: 524.41026 + tps: 549.5625 } } dps_results: { key: "TestElemental-Phase1-Settings-Troll-phase_1-Adaptive-default-FullBuffs-P1-Consumes-LongMultiTarget" value: { - dps: 700.02105 - tps: 1119.02163 + dps: 695.44163 + tps: 1114.83554 } } dps_results: { key: "TestElemental-Phase1-Settings-Troll-phase_1-Adaptive-default-FullBuffs-P1-Consumes-LongSingleTarget" value: { - dps: 597.79052 - tps: 619.08963 + dps: 596.68437 + tps: 618.0474 } } dps_results: { key: "TestElemental-Phase1-Settings-Troll-phase_1-Adaptive-default-FullBuffs-P1-Consumes-ShortSingleTarget" value: { - dps: 714.97138 - tps: 746.51695 + dps: 714.94578 + tps: 746.54052 } } dps_results: { key: "TestElemental-Phase1-Settings-Troll-phase_1-Adaptive-default-NoBuffs-P1-Consumes-LongMultiTarget" value: { - dps: 381.25748 - tps: 677.13806 + dps: 384.28045 + tps: 680.16104 } } dps_results: { key: "TestElemental-Phase1-Settings-Troll-phase_1-Adaptive-default-NoBuffs-P1-Consumes-LongSingleTarget" value: { - dps: 348.60527 - tps: 363.3993 + dps: 349.18776 + tps: 363.98179 } } dps_results: { key: "TestElemental-Phase1-Settings-Troll-phase_1-Adaptive-default-NoBuffs-P1-Consumes-ShortSingleTarget" value: { - dps: 545.15753 - tps: 570.30977 + dps: 545.03506 + tps: 570.1873 } } dps_results: { key: "TestElemental-Phase1-SwitchInFrontOfTarget-Default" value: { - dps: 612.87099 - tps: 634.2647 + dps: 611.62365 + tps: 633.09111 } } dps_results: { diff --git a/sim/shaman/enhancement/TestEnhancement.results b/sim/shaman/enhancement/TestEnhancement.results index e636eed10..a449a4d08 100644 --- a/sim/shaman/enhancement/TestEnhancement.results +++ b/sim/shaman/enhancement/TestEnhancement.results @@ -1,11 +1,11 @@ character_stats_results: { - key: "TestEnhancement-Phase5-CharacterStats-Default" + key: "TestEnhancement-Phase1-CharacterStats-Default" value: { - final_stats: 261.05 - final_stats: 218.5 - final_stats: 331.9475 - final_stats: 170.2 - final_stats: 197.8 + final_stats: 395.6 + final_stats: 351.9 + final_stats: 499.905 + final_stats: 231.15 + final_stats: 212.75 final_stats: 150 final_stats: 0 final_stats: 40 @@ -14,33 +14,33 @@ character_stats_results: { final_stats: 0 final_stats: 0 final_stats: 41.25 + final_stats: 3 + final_stats: 28.20644 final_stats: 0 - final_stats: 26.17638 final_stats: 0 + final_stats: 1804.2 + final_stats: 10 + final_stats: 48.57652 final_stats: 0 - final_stats: 1343.1 final_stats: 0 - final_stats: 32.7998 final_stats: 0 + final_stats: 4942.6125 final_stats: 0 final_stats: 0 - final_stats: 3982.65 + final_stats: 3263.8 + final_stats: 672 + final_stats: 3 + final_stats: 5.12 final_stats: 0 + final_stats: 19.69652 + final_stats: 5.12 final_stats: 0 - final_stats: 821 - final_stats: 480 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 12.7998 - final_stats: 5 - final_stats: 0 - final_stats: 4862.475 + final_stats: 6542.05 final_stats: 27 - final_stats: 60 - final_stats: 60 - final_stats: 60 - final_stats: 60 + final_stats: 115 + final_stats: 65 + final_stats: 65 + final_stats: 65 final_stats: 384 final_stats: 0 final_stats: 35 @@ -48,14 +48,14 @@ character_stats_results: { } } stat_weights_results: { - key: "TestEnhancement-Phase5-StatWeights-Default" + key: "TestEnhancement-Phase1-StatWeights-Default" value: { - weights: 0.29121 - weights: 0.14333 + weights: 0.56943 + weights: 0.58925 weights: 0 weights: 0 weights: 0 - weights: 0.18318 + weights: 0.08316 weights: 0 weights: 0 weights: 0 @@ -67,9 +67,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.12661 + weights: 0.24758 weights: 0 - weights: 2.39306 + weights: 6.61149 weights: 0 weights: 0 weights: 0 @@ -97,184 +97,247 @@ stat_weights_results: { } } dps_results: { - key: "TestEnhancement-Phase5-Average-Default" + key: "TestEnhancement-Phase1-AllItems-Champion'sEarthshaker" + value: { + dps: 748.64414 + tps: 758.24387 + } +} +dps_results: { + key: "TestEnhancement-Phase1-AllItems-Champion'sStormcaller" + value: { + dps: 753.55011 + tps: 763.36304 + } +} +dps_results: { + key: "TestEnhancement-Phase1-AllItems-GiftoftheGatheringStorm" + value: { + dps: 661.47085 + tps: 682.80298 + } +} +dps_results: { + key: "TestEnhancement-Phase1-AllItems-Stormcaller'sGarb" + value: { + dps: 801.64895 + tps: 811.63984 + } +} +dps_results: { + key: "TestEnhancement-Phase1-AllItems-TheEarthfury" + value: { + dps: 686.4389 + tps: 702.69187 + } +} +dps_results: { + key: "TestEnhancement-Phase1-AllItems-TheEarthshatterer" + value: { + dps: 685.28273 + tps: 727.06742 + } +} +dps_results: { + key: "TestEnhancement-Phase1-AllItems-TheFiveThunders" + value: { + dps: 720.23181 + tps: 731.53554 + } +} +dps_results: { + key: "TestEnhancement-Phase1-AllItems-TheTenStorms" + value: { + dps: 691.10238 + tps: 705.73717 + } +} +dps_results: { + key: "TestEnhancement-Phase1-AllItems-Warlord'sEarthshaker" + value: { + dps: 782.61583 + tps: 793.63776 + } +} +dps_results: { + key: "TestEnhancement-Phase1-Average-Default" value: { - dps: 345.52377 - tps: 390.36771 + dps: 852.87547 + tps: 865.93792 } } dps_results: { - key: "TestEnhancement-Phase5-Settings-Orc-blank-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" + key: "TestEnhancement-Phase1-Settings-Orc-phase_1-Sync Auto-default-FullBuffs-P1-Consumes-LongMultiTarget" value: { - dps: 160.14441 - tps: 351.89316 + dps: 133.25088 + tps: 433.80311 } } dps_results: { - key: "TestEnhancement-Phase5-Settings-Orc-blank-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" + key: "TestEnhancement-Phase1-Settings-Orc-phase_1-Sync Auto-default-FullBuffs-P1-Consumes-LongSingleTarget" value: { - dps: 115.11411 - tps: 113.56258 + dps: 119.41311 + tps: 120.43394 } } dps_results: { - key: "TestEnhancement-Phase5-Settings-Orc-blank-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget" + key: "TestEnhancement-Phase1-Settings-Orc-phase_1-Sync Auto-default-FullBuffs-P1-Consumes-ShortSingleTarget" value: { - dps: 168.31161 - tps: 199.41896 + dps: 228.13693 + tps: 307.1486 } } dps_results: { - key: "TestEnhancement-Phase5-Settings-Orc-blank-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" + key: "TestEnhancement-Phase1-Settings-Orc-phase_1-Sync Auto-default-NoBuffs-P1-Consumes-LongMultiTarget" value: { - dps: 72.87035 - tps: 222.13617 + dps: 65.41902 + tps: 352.69885 } } dps_results: { - key: "TestEnhancement-Phase5-Settings-Orc-blank-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" + key: "TestEnhancement-Phase1-Settings-Orc-phase_1-Sync Auto-default-NoBuffs-P1-Consumes-LongSingleTarget" value: { - dps: 52.33959 - tps: 49.80493 + dps: 58.19693 + tps: 64.69372 } } dps_results: { - key: "TestEnhancement-Phase5-Settings-Orc-blank-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget" + key: "TestEnhancement-Phase1-Settings-Orc-phase_1-Sync Auto-default-NoBuffs-P1-Consumes-ShortSingleTarget" value: { - dps: 89.32456 - tps: 105.22408 + dps: 127.99986 + tps: 183.17126 } } dps_results: { - key: "TestEnhancement-Phase5-Settings-Orc-blank-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" + key: "TestEnhancement-Phase1-Settings-Orc-phase_1-Sync Delay OH-default-FullBuffs-P1-Consumes-LongMultiTarget" value: { - dps: 160.14441 - tps: 351.89316 + dps: 133.25088 + tps: 433.80311 } } dps_results: { - key: "TestEnhancement-Phase5-Settings-Orc-blank-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" + key: "TestEnhancement-Phase1-Settings-Orc-phase_1-Sync Delay OH-default-FullBuffs-P1-Consumes-LongSingleTarget" value: { - dps: 115.11411 - tps: 113.56258 + dps: 119.41311 + tps: 120.43394 } } dps_results: { - key: "TestEnhancement-Phase5-Settings-Orc-blank-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget" + key: "TestEnhancement-Phase1-Settings-Orc-phase_1-Sync Delay OH-default-FullBuffs-P1-Consumes-ShortSingleTarget" value: { - dps: 168.31161 - tps: 199.41896 + dps: 228.13693 + tps: 307.1486 } } dps_results: { - key: "TestEnhancement-Phase5-Settings-Orc-blank-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" + key: "TestEnhancement-Phase1-Settings-Orc-phase_1-Sync Delay OH-default-NoBuffs-P1-Consumes-LongMultiTarget" value: { - dps: 72.87035 - tps: 222.13617 + dps: 65.41902 + tps: 352.69885 } } dps_results: { - key: "TestEnhancement-Phase5-Settings-Orc-blank-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" + key: "TestEnhancement-Phase1-Settings-Orc-phase_1-Sync Delay OH-default-NoBuffs-P1-Consumes-LongSingleTarget" value: { - dps: 52.33959 - tps: 49.80493 + dps: 58.19693 + tps: 64.69372 } } dps_results: { - key: "TestEnhancement-Phase5-Settings-Orc-blank-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget" + key: "TestEnhancement-Phase1-Settings-Orc-phase_1-Sync Delay OH-default-NoBuffs-P1-Consumes-ShortSingleTarget" value: { - dps: 89.32456 - tps: 105.22408 + dps: 127.99986 + tps: 183.17126 } } dps_results: { - key: "TestEnhancement-Phase5-Settings-Troll-blank-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" + key: "TestEnhancement-Phase1-Settings-Troll-phase_1-Sync Auto-default-FullBuffs-P1-Consumes-LongMultiTarget" value: { - dps: 155.76666 - tps: 345.97438 + dps: 129.71412 + tps: 430.11079 } } dps_results: { - key: "TestEnhancement-Phase5-Settings-Troll-blank-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" + key: "TestEnhancement-Phase1-Settings-Troll-phase_1-Sync Auto-default-FullBuffs-P1-Consumes-LongSingleTarget" value: { - dps: 114.47404 - tps: 113.66346 + dps: 115.43164 + tps: 115.98262 } } dps_results: { - key: "TestEnhancement-Phase5-Settings-Troll-blank-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget" + key: "TestEnhancement-Phase1-Settings-Troll-phase_1-Sync Auto-default-FullBuffs-P1-Consumes-ShortSingleTarget" value: { - dps: 168.28875 - tps: 199.6877 + dps: 222.99425 + tps: 299.87783 } } dps_results: { - key: "TestEnhancement-Phase5-Settings-Troll-blank-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" + key: "TestEnhancement-Phase1-Settings-Troll-phase_1-Sync Auto-default-NoBuffs-P1-Consumes-LongMultiTarget" value: { - dps: 73.55087 - tps: 225.52588 + dps: 66.29345 + tps: 353.2895 } } dps_results: { - key: "TestEnhancement-Phase5-Settings-Troll-blank-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" + key: "TestEnhancement-Phase1-Settings-Troll-phase_1-Sync Auto-default-NoBuffs-P1-Consumes-LongSingleTarget" value: { - dps: 50.0348 - tps: 45.56414 + dps: 57.26315 + tps: 63.16844 } } dps_results: { - key: "TestEnhancement-Phase5-Settings-Troll-blank-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget" + key: "TestEnhancement-Phase1-Settings-Troll-phase_1-Sync Auto-default-NoBuffs-P1-Consumes-ShortSingleTarget" value: { - dps: 87.90693 - tps: 98.65753 + dps: 124.98641 + tps: 179.07219 } } dps_results: { - key: "TestEnhancement-Phase5-Settings-Troll-blank-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget" + key: "TestEnhancement-Phase1-Settings-Troll-phase_1-Sync Delay OH-default-FullBuffs-P1-Consumes-LongMultiTarget" value: { - dps: 155.76666 - tps: 345.97438 + dps: 129.71412 + tps: 430.11079 } } dps_results: { - key: "TestEnhancement-Phase5-Settings-Troll-blank-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget" + key: "TestEnhancement-Phase1-Settings-Troll-phase_1-Sync Delay OH-default-FullBuffs-P1-Consumes-LongSingleTarget" value: { - dps: 114.47404 - tps: 113.66346 + dps: 115.43164 + tps: 115.98262 } } dps_results: { - key: "TestEnhancement-Phase5-Settings-Troll-blank-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget" + key: "TestEnhancement-Phase1-Settings-Troll-phase_1-Sync Delay OH-default-FullBuffs-P1-Consumes-ShortSingleTarget" value: { - dps: 168.28875 - tps: 199.6877 + dps: 222.99425 + tps: 299.87783 } } dps_results: { - key: "TestEnhancement-Phase5-Settings-Troll-blank-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget" + key: "TestEnhancement-Phase1-Settings-Troll-phase_1-Sync Delay OH-default-NoBuffs-P1-Consumes-LongMultiTarget" value: { - dps: 73.55087 - tps: 225.52588 + dps: 66.29345 + tps: 353.2895 } } dps_results: { - key: "TestEnhancement-Phase5-Settings-Troll-blank-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget" + key: "TestEnhancement-Phase1-Settings-Troll-phase_1-Sync Delay OH-default-NoBuffs-P1-Consumes-LongSingleTarget" value: { - dps: 50.0348 - tps: 45.56414 + dps: 57.26315 + tps: 63.16844 } } dps_results: { - key: "TestEnhancement-Phase5-Settings-Troll-blank-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget" + key: "TestEnhancement-Phase1-Settings-Troll-phase_1-Sync Delay OH-default-NoBuffs-P1-Consumes-ShortSingleTarget" value: { - dps: 87.90693 - tps: 98.65753 + dps: 124.98641 + tps: 179.07219 } } dps_results: { - key: "TestEnhancement-Phase5-SwitchInFrontOfTarget-Default" + key: "TestEnhancement-Phase1-SwitchInFrontOfTarget-Default" value: { - dps: 311.60111 - tps: 355.75178 + dps: 645.70323 + tps: 656.64516 } } diff --git a/sim/shaman/enhancement/enhancement_test.go b/sim/shaman/enhancement/enhancement_test.go index 3e112afc1..07b77f614 100644 --- a/sim/shaman/enhancement/enhancement_test.go +++ b/sim/shaman/enhancement/enhancement_test.go @@ -21,7 +21,7 @@ func TestEnhancement(t *testing.T) { OtherRaces: []proto.Race{proto.Race_RaceOrc}, Talents: DefaultTalents, - GearSet: core.GetGearSet("../../../ui/enhancement_shaman/gear_sets", "blank"), + GearSet: core.GetGearSet("../../../ui/enhancement_shaman/gear_sets", "phase_1"), Rotation: core.GetAplRotation("../../../ui/enhancement_shaman/apls", "default"), Buffs: core.FullBuffs, Consumes: Phase1Consumes, diff --git a/sim/shaman/shaman.go b/sim/shaman/shaman.go index 852444f79..8a8d63e64 100644 --- a/sim/shaman/shaman.go +++ b/sim/shaman/shaman.go @@ -186,7 +186,9 @@ func (shaman *Shaman) Reset(_ *core.Simulation) { shaman.ActiveShield = nil shaman.ActiveShieldAura = nil - for i := range shaman.TotemExpirations { + for i := range []int{EarthTotem, FireTotem, WaterTotem, AirTotem} { + shaman.ActiveTotems[i] = nil shaman.TotemExpirations[i] = 0 + shaman.ActiveTotemBuffs[i] = nil } } diff --git a/ui/elemental_shaman/gear_sets/phase_1.gear.json b/ui/elemental_shaman/gear_sets/phase_1.gear.json index c3a1ffaae..1b2cba69d 100644 --- a/ui/elemental_shaman/gear_sets/phase_1.gear.json +++ b/ui/elemental_shaman/gear_sets/phase_1.gear.json @@ -9,7 +9,7 @@ {"id":13253}, {"id":19136}, {"id":19165,"enchant":1509}, - {"id":11822,"enchant":911}, + {"id":22240,"enchant":911}, {"id":19147}, {"id":19147}, {"id":18820},