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.

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

Add stoneskin totem as a shaman option, fix some shaman mana cost bug… #2265

Merged
merged 1 commit into from
Jan 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions proto/shaman.proto
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ enum EarthTotem {
NoEarthTotem = 0;
StrengthOfEarthTotem = 1;
TremorTotem = 2;
StoneskinTotem = 3;
}

enum AirTotem {
Expand Down
6 changes: 3 additions & 3 deletions sim/priest/healing/TestDisc.results
Original file line number Diff line number Diff line change
Expand Up @@ -965,23 +965,23 @@ dps_results: {
value: {
dps: 46.29484
tps: 923.38559
hps: 3815.47503
hps: 3865.92202
}
}
dps_results: {
key: "TestDisc-Settings-Undead-P1-Disc-NoBuffs-LongSingleTarget"
value: {
dps: 46.29484
tps: 46.16928
hps: 3815.47503
hps: 3865.92202
}
}
dps_results: {
key: "TestDisc-Settings-Undead-P1-Disc-NoBuffs-ShortSingleTarget"
value: {
dps: 231.47421
tps: 111.20851
hps: 6223.79078
hps: 6224.24357
}
}
dps_results: {
Expand Down
18 changes: 9 additions & 9 deletions sim/priest/healing/TestHoly.results
Original file line number Diff line number Diff line change
Expand Up @@ -918,25 +918,25 @@ dps_results: {
dps_results: {
key: "TestHoly-Settings-Undead-P1-Holy-NoBuffs-LongMultiTarget"
value: {
dps: 48.47615
tps: 442.41013
hps: 2397.88991
dps: 48.815
tps: 445.41013
hps: 2465.27937
}
}
dps_results: {
key: "TestHoly-Settings-Undead-P1-Holy-NoBuffs-LongSingleTarget"
value: {
dps: 48.47615
tps: 22.12051
hps: 2397.88991
dps: 48.815
tps: 22.27051
hps: 2465.27937
}
}
dps_results: {
key: "TestHoly-Settings-Undead-P1-Holy-NoBuffs-ShortSingleTarget"
value: {
dps: 242.38076
tps: 99.36047
hps: 5855.88701
dps: 244.07498
tps: 98.28599
hps: 5912.81696
}
}
dps_results: {
Expand Down
1 change: 1 addition & 0 deletions sim/priest/priest.go
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ func (priest *Priest) HasMinorGlyph(glyph proto.PriestMinorGlyph) bool {

func (priest *Priest) AddRaidBuffs(raidBuffs *proto.RaidBuffs) {
raidBuffs.ShadowProtection = true
raidBuffs.DivineSpirit = true

raidBuffs.PowerWordFortitude = core.MaxTristate(raidBuffs.PowerWordFortitude, core.MakeTristateValue(
true,
Expand Down
108 changes: 54 additions & 54 deletions sim/priest/shadow/TestShadow.results
Original file line number Diff line number Diff line change
Expand Up @@ -810,22 +810,22 @@ dps_results: {
dps_results: {
key: "TestShadow-Settings-Draenei-P1-Basic-NoBuffs-LongMultiTarget"
value: {
dps: 3179.48052
tps: 4041.74966
dps: 3295.82347
tps: 4156.95718
}
}
dps_results: {
key: "TestShadow-Settings-Draenei-P1-Basic-NoBuffs-LongSingleTarget"
value: {
dps: 3179.48052
tps: 3079.43259
dps: 3295.82347
tps: 3194.64011
}
}
dps_results: {
key: "TestShadow-Settings-Draenei-P1-Basic-NoBuffs-ShortSingleTarget"
value: {
dps: 3859.14133
tps: 3670.19953
dps: 3876.67502
tps: 3688.20951
}
}
dps_results: {
Expand All @@ -852,22 +852,22 @@ dps_results: {
dps_results: {
key: "TestShadow-Settings-Draenei-P1-Clipping-NoBuffs-LongMultiTarget"
value: {
dps: 3074.10343
tps: 3934.82197
dps: 3156.1037
tps: 4014.39406
}
}
dps_results: {
key: "TestShadow-Settings-Draenei-P1-Clipping-NoBuffs-LongSingleTarget"
value: {
dps: 3074.10343
tps: 2972.5049
dps: 3156.1037
tps: 3052.07699
}
}
dps_results: {
key: "TestShadow-Settings-Draenei-P1-Clipping-NoBuffs-ShortSingleTarget"
value: {
dps: 3638.61531
tps: 3449.81117
dps: 3635.43134
tps: 3446.08416
}
}
dps_results: {
Expand All @@ -894,22 +894,22 @@ dps_results: {
dps_results: {
key: "TestShadow-Settings-Draenei-P1-Ideal-NoBuffs-LongMultiTarget"
value: {
dps: 3143.95514
tps: 4005.42227
dps: 3218.71393
tps: 4067.3837
}
}
dps_results: {
key: "TestShadow-Settings-Draenei-P1-Ideal-NoBuffs-LongSingleTarget"
value: {
dps: 3143.95514
tps: 3043.10521
dps: 3218.71393
tps: 3118.49431
}
}
dps_results: {
key: "TestShadow-Settings-Draenei-P1-Ideal-NoBuffs-ShortSingleTarget"
value: {
dps: 3910.61632
tps: 3722.63817
dps: 3916.8271
tps: 3728.01171
}
}
dps_results: {
Expand All @@ -936,22 +936,22 @@ dps_results: {
dps_results: {
key: "TestShadow-Settings-NightElf-P1-Basic-NoBuffs-LongMultiTarget"
value: {
dps: 3194.17874
tps: 4055.5882
dps: 3281.21516
tps: 4141.79577
}
}
dps_results: {
key: "TestShadow-Settings-NightElf-P1-Basic-NoBuffs-LongSingleTarget"
value: {
dps: 3194.17874
tps: 3094.08813
dps: 3281.21516
tps: 3180.2957
}
}
dps_results: {
key: "TestShadow-Settings-NightElf-P1-Basic-NoBuffs-ShortSingleTarget"
value: {
dps: 3852.68095
tps: 3663.70773
dps: 3871.36584
tps: 3682.99577
}
}
dps_results: {
Expand All @@ -978,22 +978,22 @@ dps_results: {
dps_results: {
key: "TestShadow-Settings-NightElf-P1-Clipping-NoBuffs-LongMultiTarget"
value: {
dps: 3064.18956
tps: 3924.83134
dps: 3140.96752
tps: 3997.9834
}
}
dps_results: {
key: "TestShadow-Settings-NightElf-P1-Clipping-NoBuffs-LongSingleTarget"
value: {
dps: 3064.18956
tps: 2963.33127
dps: 3140.96752
tps: 3036.48333
}
}
dps_results: {
key: "TestShadow-Settings-NightElf-P1-Clipping-NoBuffs-ShortSingleTarget"
value: {
dps: 3634.10672
tps: 3445.45277
dps: 3631.16695
tps: 3441.60764
}
}
dps_results: {
Expand All @@ -1020,22 +1020,22 @@ dps_results: {
dps_results: {
key: "TestShadow-Settings-NightElf-P1-Ideal-NoBuffs-LongMultiTarget"
value: {
dps: 3134.67202
tps: 3996.05439
dps: 3226.60756
tps: 4089.61617
}
}
dps_results: {
key: "TestShadow-Settings-NightElf-P1-Ideal-NoBuffs-LongSingleTarget"
value: {
dps: 3134.67202
tps: 3034.55432
dps: 3226.60756
tps: 3128.1161
}
}
dps_results: {
key: "TestShadow-Settings-NightElf-P1-Ideal-NoBuffs-ShortSingleTarget"
value: {
dps: 3911.09799
tps: 3721.79945
dps: 3910.78409
tps: 3721.94365
}
}
dps_results: {
Expand All @@ -1062,22 +1062,22 @@ dps_results: {
dps_results: {
key: "TestShadow-Settings-Undead-P1-Basic-NoBuffs-LongMultiTarget"
value: {
dps: 3217.02585
tps: 4076.37119
dps: 3283.42212
tps: 4142.58822
}
}
dps_results: {
key: "TestShadow-Settings-Undead-P1-Basic-NoBuffs-LongSingleTarget"
value: {
dps: 3217.02585
tps: 3116.50512
dps: 3283.42212
tps: 3182.72215
}
}
dps_results: {
key: "TestShadow-Settings-Undead-P1-Basic-NoBuffs-ShortSingleTarget"
value: {
dps: 3853.81992
tps: 3664.62764
dps: 3872.50555
tps: 3683.91747
}
}
dps_results: {
Expand All @@ -1104,22 +1104,22 @@ dps_results: {
dps_results: {
key: "TestShadow-Settings-Undead-P1-Clipping-NoBuffs-LongMultiTarget"
value: {
dps: 3072.59202
tps: 3931.39176
dps: 3145.27953
tps: 4002.01556
}
}
dps_results: {
key: "TestShadow-Settings-Undead-P1-Clipping-NoBuffs-LongSingleTarget"
value: {
dps: 3072.59202
tps: 2971.52569
dps: 3145.27953
tps: 3042.14949
}
}
dps_results: {
key: "TestShadow-Settings-Undead-P1-Clipping-NoBuffs-ShortSingleTarget"
value: {
dps: 3635.17371
tps: 3446.30103
dps: 3632.22753
tps: 3442.44973
}
}
dps_results: {
Expand All @@ -1146,22 +1146,22 @@ dps_results: {
dps_results: {
key: "TestShadow-Settings-Undead-P1-Ideal-NoBuffs-LongMultiTarget"
value: {
dps: 3125.32682
tps: 3985.37558
dps: 3234.43345
tps: 4095.17523
}
}
dps_results: {
key: "TestShadow-Settings-Undead-P1-Ideal-NoBuffs-LongSingleTarget"
value: {
dps: 3125.32682
tps: 3025.50951
dps: 3234.43345
tps: 3135.30916
}
}
dps_results: {
key: "TestShadow-Settings-Undead-P1-Ideal-NoBuffs-ShortSingleTarget"
value: {
dps: 3913.92581
tps: 3726.03737
dps: 3911.9331
tps: 3722.874
}
}
dps_results: {
Expand Down
12 changes: 6 additions & 6 deletions sim/priest/smite/TestSmite.results
Original file line number Diff line number Diff line change
Expand Up @@ -810,22 +810,22 @@ dps_results: {
dps_results: {
key: "TestSmite-Settings-Undead-P1-Basic-NoBuffs-LongMultiTarget"
value: {
dps: 1063.9483
tps: 1326.64675
dps: 1116.06882
tps: 1373.42671
}
}
dps_results: {
key: "TestSmite-Settings-Undead-P1-Basic-NoBuffs-LongSingleTarget"
value: {
dps: 1063.9483
tps: 917.72126
dps: 1116.06882
tps: 964.50123
}
}
dps_results: {
key: "TestSmite-Settings-Undead-P1-Basic-NoBuffs-ShortSingleTarget"
value: {
dps: 2573.43723
tps: 2076.36088
dps: 2589.41624
tps: 2086.69684
}
}
dps_results: {
Expand Down
2 changes: 1 addition & 1 deletion sim/shaman/chain_lightning.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ func (shaman *Shaman) registerChainLightningSpell() {
func (shaman *Shaman) newChainLightningSpell(isLightningOverload bool) *core.Spell {
spellConfig := shaman.newElectricSpellConfig(
core.ActionID{SpellID: 49271},
baseMana*0.26,
0.26*shaman.BaseMana,
time.Millisecond*2000,
isLightningOverload)

Expand Down
Loading