Skip to content

Commit

Permalink
Merge pull request #1134 from ncberman/chimSerpentUpdates
Browse files Browse the repository at this point in the history 
Updates for chimera - serpent changes/fixes all confirmed by Zirene
  • Loading branch information
@kayla-glick
kayla-glick authored Nov 15, 2024
2 parents 9b584ef + 27ea2fe commit e4d9a71
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 50 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 @@ -246,43 +246,43 @@ dps_results: {
dps_results: {
key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-LongMultiTarget"
value: {
dps: 768.36285
tps: 875.08778
dps: 768.25802
tps: 874.98295
}
}
dps_results: {
key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-LongSingleTarget"
value: {
dps: 691.20791
tps: 440.9837
dps: 691.18222
tps: 440.95801
}
}
dps_results: {
key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-ShortSingleTarget"
value: {
dps: 754.09772
tps: 485.07744
dps: 753.95528
tps: 484.93499
}
}
dps_results: {
key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_ranged_bm-NoBuffs-P2-Consumes-LongMultiTarget"
value: {
dps: 444.91874
tps: 675.4987
dps: 444.84681
tps: 675.37155
}
}
dps_results: {
key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_ranged_bm-NoBuffs-P2-Consumes-LongSingleTarget"
value: {
dps: 395.09569
tps: 272.28349
dps: 394.94068
tps: 272.12849
}
}
dps_results: {
key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_ranged_bm-NoBuffs-P2-Consumes-ShortSingleTarget"
value: {
dps: 425.04455
tps: 291.3141
dps: 424.27847
tps: 290.54802
}
}
dps_results: {
Expand Down Expand Up @@ -414,43 +414,43 @@ dps_results: {
dps_results: {
key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-LongMultiTarget"
value: {
dps: 765.92665
tps: 871.98709
dps: 765.65159
tps: 871.71203
}
}
dps_results: {
key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-LongSingleTarget"
value: {
dps: 691.01311
tps: 434.28317
dps: 690.80485
tps: 434.07492
}
}
dps_results: {
key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-ShortSingleTarget"
value: {
dps: 756.99396
tps: 478.84505
dps: 756.85152
tps: 478.7026
}
}
dps_results: {
key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_ranged_bm-NoBuffs-P2-Consumes-LongMultiTarget"
value: {
dps: 447.49354
tps: 671.35611
dps: 447.42634
tps: 671.28891
}
}
dps_results: {
key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_ranged_bm-NoBuffs-P2-Consumes-LongSingleTarget"
value: {
dps: 395.9863
tps: 268.63732
dps: 395.88326
tps: 268.53428
}
}
dps_results: {
key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_ranged_bm-NoBuffs-P2-Consumes-ShortSingleTarget"
value: {
dps: 427.61997
tps: 287.81679
dps: 426.85389
tps: 287.05071
}
}
dps_results: {
Expand Down
28 changes: 14 additions & 14 deletions sim/hunter/TestMM.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,29 +232,29 @@ dps_results: {
dps_results: {
key: "TestMM-Phase2-Lvl40-Settings-Dwarf-p2_ranged_mm-Basic-p2_ranged_mm-FullBuffs-P2-Consumes-ShortSingleTarget"
value: {
dps: 579.0025
tps: 435.14489
dps: 578.85724
tps: 434.99963
}
}
dps_results: {
key: "TestMM-Phase2-Lvl40-Settings-Dwarf-p2_ranged_mm-Basic-p2_ranged_mm-NoBuffs-P2-Consumes-LongMultiTarget"
value: {
dps: 365.89961
tps: 477.18743
dps: 365.88133
tps: 477.16915
}
}
dps_results: {
key: "TestMM-Phase2-Lvl40-Settings-Dwarf-p2_ranged_mm-Basic-p2_ranged_mm-NoBuffs-P2-Consumes-LongSingleTarget"
value: {
dps: 316.56399
tps: 248.20619
dps: 316.54571
tps: 248.18791
}
}
dps_results: {
key: "TestMM-Phase2-Lvl40-Settings-Dwarf-p2_ranged_mm-Basic-p2_ranged_mm-NoBuffs-P2-Consumes-ShortSingleTarget"
value: {
dps: 335.55189
tps: 264.52325
dps: 335.4605
tps: 264.43186
}
}
dps_results: {
Expand All @@ -274,8 +274,8 @@ dps_results: {
dps_results: {
key: "TestMM-Phase2-Lvl40-Settings-Orc-p2_ranged_mm-Basic-p2_ranged_mm-FullBuffs-P2-Consumes-ShortSingleTarget"
value: {
dps: 587.38545
tps: 437.89426
dps: 587.24019
tps: 437.749
}
}
dps_results: {
Expand All @@ -288,15 +288,15 @@ dps_results: {
dps_results: {
key: "TestMM-Phase2-Lvl40-Settings-Orc-p2_ranged_mm-Basic-p2_ranged_mm-NoBuffs-P2-Consumes-LongSingleTarget"
value: {
dps: 319.52737
tps: 247.34565
dps: 319.50909
tps: 247.32738
}
}
dps_results: {
key: "TestMM-Phase2-Lvl40-Settings-Orc-p2_ranged_mm-Basic-p2_ranged_mm-NoBuffs-P2-Consumes-ShortSingleTarget"
value: {
dps: 337.74228
tps: 262.00607
dps: 337.65089
tps: 261.91468
}
}
dps_results: {
Expand Down
1 change: 1 addition & 0 deletions sim/hunter/hunter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ const (
SpellCode_HunterMongooseBite
SpellCode_HunterWingClip
SpellCode_HunterVolley
SpellCode_HunterChimeraSerpent

// Pet Spells
SpellCode_HunterPetFlankingStrike
Expand Down
7 changes: 2 additions & 5 deletions sim/hunter/runes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,13 +149,10 @@ func (hunter *Hunter) applySniperTraining() {
OnStacksChange: func(aura *core.Aura, sim *core.Simulation, oldStacks, newStacks int32) {
statDelta := float64(newStacks - oldStacks)
for _, spell := range aura.Unit.Spellbook {
if spell.ProcMask.Matches(core.ProcMaskRangedSpecial) {
if spell.ProcMask.Matches(core.ProcMaskRangedSpecial) || spell.SpellCode == SpellCode_HunterChimeraSerpent {
spell.BonusCritRating += statDelta * 2 * core.CritRatingPerCritChance
}
// Chimera - Serpent double dips this bonus and has ProcMaskEmpty so just add 20 here
if spell.ActionID.SpellID == 409493 {
spell.BonusCritRating += statDelta * 4 * core.CritRatingPerCritChance
}

}
},
})
Expand Down
19 changes: 12 additions & 7 deletions sim/hunter/serpent_sting.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,14 @@ func (hunter *Hunter) chimeraShotSerpentStingSpell(rank int) *core.Spell {
baseDamage := [10]float64{0, 20, 40, 80, 140, 210, 290, 385, 490, 555}[rank]
spellCoeff := [10]float64{0, .4, .625, .925, 1, 1, 1, 1, 1, 1}[rank]
return hunter.RegisterSpell(core.SpellConfig{
ActionID: core.ActionID{SpellID: 409493},
SpellSchool: core.SpellSchoolNature,
CastType: proto.CastType_CastTypeRanged,
DefenseType: core.DefenseTypeRanged,
ProcMask: core.ProcMaskEmpty,
Flags: core.SpellFlagMeleeMetrics | core.SpellFlagPassiveSpell,
SpellCode: SpellCode_HunterChimeraSerpent,
ActionID: core.ActionID{SpellID: 409493},
SpellSchool: core.SpellSchoolNature,
CastType: proto.CastType_CastTypeRanged,
DefenseType: core.DefenseTypeRanged,
ProcMask: core.ProcMaskEmpty,
Flags: core.SpellFlagMeleeMetrics | core.SpellFlagPassiveSpell,
MissileSpeed: 24,

BonusCritRating: 1,

Expand All @@ -99,7 +101,10 @@ func (hunter *Hunter) chimeraShotSerpentStingSpell(rank int) *core.Spell {
ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
// As of phase 5 the only time serpent sting scales with AP is using the Dragonstalker's Pursuit 6P - this AP scaling doesn't benefit from target AP modifiers
damage := baseDamage + (hunter.SerpentStingAPCoeff * spell.RangedAttackPower(target, true))
spell.CalcAndDealDamage(sim, target, damage, spell.OutcomeRangedHitAndCrit)
result := spell.CalcDamage(sim, target, damage, spell.OutcomeRangedHitAndCrit)
spell.WaitTravelTime(sim, func(s *core.Simulation) {
spell.DealDamage(sim, result)
})
},
})
}
Expand Down

0 comments on commit e4d9a71

Please sign in to comment.