Skip to content

Commit

Permalink
Merge pull request #305 from wowsims/serpent-sting
Browse files Browse the repository at this point in the history 
fix attacker multipliers on ss from chimera
  • Loading branch information
@rosenrusinov
rosenrusinov authored Feb 26, 2024
2 parents 6fb7539 + eb11f5a commit b57e0e7
Show file tree
Hide file tree
Showing 3 changed files with 84 additions and 82 deletions.
48 changes: 24 additions & 24 deletions sim/hunter/TestBM.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -617,43 +617,43 @@ dps_results: {
dps_results: {
key: "TestBM-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_ranged_bm-FullBuffs-Phase 2 Consumes-LongMultiTarget"
value: {
dps: 720.50306
tps: 823.63723
dps: 725.46491
tps: 828.64004
}
}
dps_results: {
key: "TestBM-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_ranged_bm-FullBuffs-Phase 2 Consumes-LongSingleTarget"
value: {
dps: 649.80192
tps: 400.70447
dps: 654.75254
tps: 405.69299
}
}
dps_results: {
key: "TestBM-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_ranged_bm-FullBuffs-Phase 2 Consumes-ShortSingleTarget"
value: {
dps: 718.58636
tps: 447.05207
dps: 723.26396
tps: 451.91911
}
}
dps_results: {
key: "TestBM-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_ranged_bm-NoBuffs-Phase 2 Consumes-LongMultiTarget"
value: {
dps: 383.70384
tps: 654.40192
dps: 385.44273
tps: 656.15129
}
}
dps_results: {
key: "TestBM-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_ranged_bm-NoBuffs-Phase 2 Consumes-LongSingleTarget"
value: {
dps: 332.95853
tps: 240.57664
dps: 334.68902
tps: 242.31738
}
}
dps_results: {
key: "TestBM-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_ranged_bm-NoBuffs-Phase 2 Consumes-ShortSingleTarget"
value: {
dps: 363.64147
tps: 265.64553
dps: 365.24295
tps: 267.29823
}
}
dps_results: {
Expand Down Expand Up @@ -785,43 +785,43 @@ dps_results: {
dps_results: {
key: "TestBM-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_ranged_bm-FullBuffs-Phase 2 Consumes-LongMultiTarget"
value: {
dps: 725.45985
tps: 827.39072
dps: 730.39707
tps: 832.36891
}
}
dps_results: {
key: "TestBM-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_ranged_bm-FullBuffs-Phase 2 Consumes-LongSingleTarget"
value: {
dps: 655.19387
tps: 395.75453
dps: 660.18684
tps: 400.7854
}
}
dps_results: {
key: "TestBM-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_ranged_bm-FullBuffs-Phase 2 Consumes-ShortSingleTarget"
value: {
dps: 724.19787
tps: 440.9487
dps: 728.8958
tps: 445.83607
}
}
dps_results: {
key: "TestBM-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_ranged_bm-NoBuffs-Phase 2 Consumes-LongMultiTarget"
value: {
dps: 382.93654
tps: 651.65248
dps: 384.53808
tps: 653.26449
}
}
dps_results: {
key: "TestBM-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_ranged_bm-NoBuffs-Phase 2 Consumes-LongSingleTarget"
value: {
dps: 335.74615
tps: 239.0965
dps: 337.47385
tps: 240.83444
}
}
dps_results: {
key: "TestBM-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_ranged_bm-NoBuffs-Phase 2 Consumes-ShortSingleTarget"
value: {
dps: 365.57077
tps: 262.34583
dps: 367.15744
tps: 263.98371
}
}
dps_results: {
Expand Down
112 changes: 56 additions & 56 deletions sim/hunter/TestMM.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,8 @@ stat_weights_results: {
weights: 0
weights: 0
weights: 0
weights: 4.31374
weights: 7.20086
weights: 4.42732
weights: 7.25161
weights: 0
weights: 0
weights: 0
Expand Down Expand Up @@ -393,85 +393,85 @@ dps_results: {
dps_results: {
key: "TestMM-Lvl40-AllItems-BlackfathomAvenger'sMail"
value: {
dps: 521.92805
tps: 396.01045
dps: 528.18979
tps: 402.31667
}
}
dps_results: {
key: "TestMM-Lvl40-AllItems-BlackfathomElementalist'sHide"
value: {
dps: 525.33258
tps: 401.06615
dps: 532.26989
tps: 408.05102
}
}
dps_results: {
key: "TestMM-Lvl40-AllItems-BlackfathomSlayer'sLeather"
value: {
dps: 534.94387
tps: 407.07696
dps: 541.21903
tps: 413.39659
}
}
dps_results: {
key: "TestMM-Lvl40-AllItems-BloodlashBow-216516"
value: {
dps: 559.67756
tps: 428.26029
dps: 566.25474
tps: 434.86629
}
}
dps_results: {
key: "TestMM-Lvl40-AllItems-ElectromanticDevastator'sMail"
value: {
dps: 554.50602
tps: 422.00721
dps: 561.06737
tps: 428.6004
}
}
dps_results: {
key: "TestMM-Lvl40-AllItems-ElectromanticStormbringer'sChain"
value: {
dps: 543.28675
tps: 416.20633
dps: 551.14571
tps: 424.10013
}
}
dps_results: {
key: "TestMM-Lvl40-AllItems-HyperconductiveMender'sMeditation"
value: {
dps: 516.80429
tps: 388.17025
dps: 523.17734
tps: 394.57246
}
}
dps_results: {
key: "TestMM-Lvl40-AllItems-HyperconductiveWizard'sAttire"
value: {
dps: 547.66169
tps: 421.58561
dps: 555.67392
tps: 429.63744
}
}
dps_results: {
key: "TestMM-Lvl40-AllItems-InsulatedLeathers"
value: {
dps: 547.84718
tps: 416.46536
dps: 554.42581
tps: 423.07582
}
}
dps_results: {
key: "TestMM-Lvl40-AllItems-InsulatedSorceror'sLeathers"
value: {
dps: 541.87065
tps: 415.80161
dps: 546.54937
tps: 420.49946
}
}
dps_results: {
key: "TestMM-Lvl40-AllItems-IrradiatedGarments"
value: {
dps: 550.83489
tps: 422.2707
dps: 558.88628
tps: 430.36028
}
}
dps_results: {
key: "TestMM-Lvl40-AllItems-SignetofBeasts-209823"
value: {
dps: 592.66605
tps: 462.31632
dps: 599.29525
tps: 468.97471
}
}
dps_results: {
Expand All @@ -484,105 +484,105 @@ dps_results: {
dps_results: {
key: "TestMM-Lvl40-AllItems-TwilightInvoker'sVestments"
value: {
dps: 520.74783
tps: 397.07572
dps: 527.57466
tps: 403.94962
}
}
dps_results: {
key: "TestMM-Lvl40-Average-Default"
value: {
dps: 598.9702
tps: 467.40272
dps: 605.5799
tps: 474.04556
}
}
dps_results: {
key: "TestMM-Lvl40-Settings-Dwarf-p2_ranged_mm-Basic-p2_ranged_mm-FullBuffs-Phase 2 Consumes-LongMultiTarget"
value: {
dps: 683.76204
tps: 870.06579
dps: 690.35257
tps: 876.68684
}
}
dps_results: {
key: "TestMM-Lvl40-Settings-Dwarf-p2_ranged_mm-Basic-p2_ranged_mm-FullBuffs-Phase 2 Consumes-LongSingleTarget"
value: {
dps: 598.87976
tps: 474.66989
dps: 605.61947
tps: 481.43879
}
}
dps_results: {
key: "TestMM-Lvl40-Settings-Dwarf-p2_ranged_mm-Basic-p2_ranged_mm-FullBuffs-Phase 2 Consumes-ShortSingleTarget"
value: {
dps: 639.2147
tps: 516.34047
dps: 645.35552
tps: 522.6272
}
}
dps_results: {
key: "TestMM-Lvl40-Settings-Dwarf-p2_ranged_mm-Basic-p2_ranged_mm-NoBuffs-Phase 2 Consumes-LongMultiTarget"
value: {
dps: 374.80843
tps: 630.70142
dps: 377.10518
tps: 633.01038
}
}
dps_results: {
key: "TestMM-Lvl40-Settings-Dwarf-p2_ranged_mm-Basic-p2_ranged_mm-NoBuffs-Phase 2 Consumes-LongSingleTarget"
value: {
dps: 318.70068
tps: 275.92394
dps: 321.0149
tps: 278.25013
}
}
dps_results: {
key: "TestMM-Lvl40-Settings-Dwarf-p2_ranged_mm-Basic-p2_ranged_mm-NoBuffs-Phase 2 Consumes-ShortSingleTarget"
value: {
dps: 350.64939
tps: 304.32438
dps: 352.83112
tps: 306.56591
}
}
dps_results: {
key: "TestMM-Lvl40-Settings-Orc-p2_ranged_mm-Basic-p2_ranged_mm-FullBuffs-Phase 2 Consumes-LongMultiTarget"
value: {
dps: 686.19352
tps: 871.54546
dps: 692.71712
tps: 878.09959
}
}
dps_results: {
key: "TestMM-Lvl40-Settings-Orc-p2_ranged_mm-Basic-p2_ranged_mm-FullBuffs-Phase 2 Consumes-LongSingleTarget"
value: {
dps: 599.79963
tps: 469.42852
dps: 606.44225
tps: 476.10032
}
}
dps_results: {
key: "TestMM-Lvl40-Settings-Orc-p2_ranged_mm-Basic-p2_ranged_mm-FullBuffs-Phase 2 Consumes-ShortSingleTarget"
value: {
dps: 641.56336
tps: 511.12951
dps: 647.64976
tps: 517.36183
}
}
dps_results: {
key: "TestMM-Lvl40-Settings-Orc-p2_ranged_mm-Basic-p2_ranged_mm-NoBuffs-Phase 2 Consumes-LongMultiTarget"
value: {
dps: 373.01666
tps: 623.37488
dps: 375.27268
tps: 625.64311
}
}
dps_results: {
key: "TestMM-Lvl40-Settings-Orc-p2_ranged_mm-Basic-p2_ranged_mm-NoBuffs-Phase 2 Consumes-LongSingleTarget"
value: {
dps: 319.66925
tps: 273.8984
dps: 321.98212
tps: 276.22323
}
}
dps_results: {
key: "TestMM-Lvl40-Settings-Orc-p2_ranged_mm-Basic-p2_ranged_mm-NoBuffs-Phase 2 Consumes-ShortSingleTarget"
value: {
dps: 353.09949
tps: 305.58552
dps: 355.30239
tps: 307.84823
}
}
dps_results: {
key: "TestMM-Lvl40-SwitchInFrontOfTarget-Default"
value: {
dps: 598.46364
tps: 467.65398
dps: 605.03072
tps: 474.25322
}
}
6 changes: 4 additions & 2 deletions sim/hunter/serpent_sting.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (

"github.com/wowsims/sod/sim/core"
"github.com/wowsims/sod/sim/core/proto"
"github.com/wowsims/sod/sim/core/stats"
)

func (hunter *Hunter) getSerpentStingConfig(rank int) core.SpellConfig {
Expand Down Expand Up @@ -59,7 +60,7 @@ func (hunter *Hunter) getSerpentStingConfig(rank int) core.SpellConfig {
dot.SnapshotAttackerMultiplier = dot.Spell.AttackerDamageMultiplier(attackTable)
} else {
// Serpent Sting double dips on the generic spell power of the hunter when rollovered with Chimera
dot.SnapshotBaseDamage += spellCoeff * dot.Spell.SpellPower()
dot.SnapshotBaseDamage += spellCoeff * (dot.Spell.SpellDamage() - dot.Spell.Unit.GetStat(stats.NaturePower))
}
},
OnTick: func(sim *core.Simulation, target *core.Unit, dot *core.Dot) {
Expand Down Expand Up @@ -96,7 +97,8 @@ func (hunter *Hunter) chimeraShotSerpentStingSpell(rank int) *core.Spell {
ThreatMultiplier: 1,

ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
baseDamage := (hunter.SerpentSting.Dot(target).SnapshotBaseDamage*5)*0.4 + spellCoeff*spell.SpellDamage()
baseDamage := (hunter.SerpentSting.Dot(target).SnapshotBaseDamage*hunter.SerpentSting.Dot(target).SnapshotAttackerMultiplier*5)*0.4 +
spellCoeff*spell.SpellDamage()
spell.CalcAndDealDamage(sim, target, baseDamage, spell.OutcomeRangedCritOnly)
},
})
Expand Down

0 comments on commit b57e0e7

Please sign in to comment.