Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removed Ignore Haste from FET spell #1704

Merged
merged 2 commits into from
Nov 14, 2022
Merged

Removed Ignore Haste from FET spell #1704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
253d1e4
Fire Elemental Totem spell will no reduce it's gcd based on haste
Horatio27 Nov 14, 2022
5ff084a
Removed Ignore Haste from fire elemental spell
Horatio27 Nov 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions sim/shaman/elemental/TestElemental.results
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -782,43 +782,43 @@ dps_results: {
dps_results: {
key: "TestElemental-Settings-Orc-P1-EleFireElemental-FullBuffs-LongMultiTarget"
value: {
dps: 8816.68094
tps: 6150.04634
dps: 8893.03423
tps: 6219.63481
}
}
dps_results: {
key: "TestElemental-Settings-Orc-P1-EleFireElemental-FullBuffs-LongSingleTarget"
value: {
dps: 4906.40887
tps: 3345.29903
dps: 4927.54111
tps: 3363.7888
}
}
dps_results: {
key: "TestElemental-Settings-Orc-P1-EleFireElemental-FullBuffs-ShortSingleTarget"
value: {
dps: 6181.94155
tps: 3687.73254
dps: 6269.28819
tps: 3787.00524
}
}
dps_results: {
key: "TestElemental-Settings-Orc-P1-EleFireElemental-NoBuffs-LongMultiTarget"
value: {
dps: 4130.09492
tps: 1760.10056
dps: 4158.21711
tps: 1780.83114
}
}
dps_results: {
key: "TestElemental-Settings-Orc-P1-EleFireElemental-NoBuffs-LongSingleTarget"
value: {
dps: 2280.12899
tps: 1440.18675
dps: 2305.99215
tps: 1459.98654
}
}
dps_results: {
key: "TestElemental-Settings-Orc-P1-EleFireElemental-NoBuffs-ShortSingleTarget"
value: {
dps: 4624.83952
tps: 2649.86655
dps: 4722.45426
tps: 2735.84147
}
}
dps_results: {
Expand Down Expand Up @@ -866,43 +866,43 @@ dps_results: {
dps_results: {
key: "TestElemental-Settings-Troll-P1-EleFireElemental-FullBuffs-LongMultiTarget"
value: {
dps: 9057.30529
tps: 6481.77786
dps: 9081.56154
tps: 6497.45493
}
}
dps_results: {
key: "TestElemental-Settings-Troll-P1-EleFireElemental-FullBuffs-LongSingleTarget"
value: {
dps: 5146.886
tps: 3543.94534
dps: 5186.87275
tps: 3580.36173
}
}
dps_results: {
key: "TestElemental-Settings-Troll-P1-EleFireElemental-FullBuffs-ShortSingleTarget"
value: {
dps: 6448.18647
tps: 3964.37059
dps: 6497.73824
tps: 4020.31194
}
}
dps_results: {
key: "TestElemental-Settings-Troll-P1-EleFireElemental-NoBuffs-LongMultiTarget"
value: {
dps: 3977.14773
tps: 1732.89528
dps: 3971.00644
tps: 1734.77903
}
}
dps_results: {
key: "TestElemental-Settings-Troll-P1-EleFireElemental-NoBuffs-LongSingleTarget"
value: {
dps: 2228.45482
tps: 1427.38311
dps: 2199.18408
tps: 1407.1703
}
}
dps_results: {
key: "TestElemental-Settings-Troll-P1-EleFireElemental-NoBuffs-ShortSingleTarget"
value: {
dps: 4825.54364
tps: 2869.92393
dps: 4828.7011
tps: 2880.59361
}
}
dps_results: {
Expand Down
48 changes: 24 additions & 24 deletions sim/shaman/enhancement/TestEnhancement.results
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -738,43 +738,43 @@ dps_results: {
dps_results: {
key: "TestEnhancement-Settings-Orc-P1-EnhFireElemental-FullBuffs-LongMultiTarget"
value: {
dps: 18306.51261
tps: 10278.93784
dps: 18343.90471
tps: 10270.72551
}
}
dps_results: {
key: "TestEnhancement-Settings-Orc-P1-EnhFireElemental-FullBuffs-LongSingleTarget"
value: {
dps: 6479.37838
tps: 3369.50391
dps: 6518.38042
tps: 3395.11569
}
}
dps_results: {
key: "TestEnhancement-Settings-Orc-P1-EnhFireElemental-FullBuffs-ShortSingleTarget"
value: {
dps: 8015.94107
tps: 3694.62406
dps: 8033.30178
tps: 3701.95749
}
}
dps_results: {
key: "TestEnhancement-Settings-Orc-P1-EnhFireElemental-NoBuffs-LongMultiTarget"
value: {
dps: 13287.45205
tps: 7993.6169
dps: 12936.47641
tps: 7745.48973
}
}
dps_results: {
key: "TestEnhancement-Settings-Orc-P1-EnhFireElemental-NoBuffs-LongSingleTarget"
value: {
dps: 3639.08828
tps: 1859.59705
dps: 3628.2082
tps: 1859.63805
}
}
dps_results: {
key: "TestEnhancement-Settings-Orc-P1-EnhFireElemental-NoBuffs-ShortSingleTarget"
value: {
dps: 5042.99507
tps: 2287.92528
dps: 5117.68579
tps: 2326.89425
}
}
dps_results: {
Expand Down Expand Up @@ -822,43 +822,43 @@ dps_results: {
dps_results: {
key: "TestEnhancement-Settings-Troll-P1-EnhFireElemental-FullBuffs-LongMultiTarget"
value: {
dps: 18011.94088
tps: 10204.09358
dps: 18018.39043
tps: 10199.38631
}
}
dps_results: {
key: "TestEnhancement-Settings-Troll-P1-EnhFireElemental-FullBuffs-LongSingleTarget"
value: {
dps: 6466.62302
tps: 3401.98788
dps: 6494.89732
tps: 3423.70322
}
}
dps_results: {
key: "TestEnhancement-Settings-Troll-P1-EnhFireElemental-FullBuffs-ShortSingleTarget"
value: {
dps: 7972.98649
tps: 3758.46586
dps: 7996.87258
tps: 3783.97263
}
}
dps_results: {
key: "TestEnhancement-Settings-Troll-P1-EnhFireElemental-NoBuffs-LongMultiTarget"
value: {
dps: 12432.9309
tps: 7490.23288
dps: 13016.34547
tps: 7903.57112
}
}
dps_results: {
key: "TestEnhancement-Settings-Troll-P1-EnhFireElemental-NoBuffs-LongSingleTarget"
value: {
dps: 3560.24757
tps: 1855.04784
dps: 3570.85514
tps: 1856.36306
}
}
dps_results: {
key: "TestEnhancement-Settings-Troll-P1-EnhFireElemental-NoBuffs-ShortSingleTarget"
value: {
dps: 4977.76501
tps: 2322.37764
dps: 5030.42761
tps: 2354.61792
}
}
dps_results: {
Expand Down
1 change: 0 additions & 1 deletion sim/shaman/fire_elemental_totem.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ func (shaman *Shaman) registerFireElementalTotem() {
Cost: manaCost,
GCD: core.GCDDefault,
},
IgnoreHaste: true,
CD: core.Cooldown{
Timer: shaman.NewTimer(),
Duration: time.Minute * time.Duration(core.TernaryFloat64(shaman.HasMajorGlyph(proto.ShamanMajorGlyph_GlyphOfFireElementalTotem), 5, 10)),
Expand Down