Skip to content

spellmod mortal shots #1456

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

Merged
kayla-glick merged 2 commits into from
May 1, 2025
Merged

spellmod mortal shots #1456

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ff07f3
spellmod mortal shots
JJwang11 Apr 29, 2025
4c9cec4
moved mortal shots on autoshot to talents
JJwang11 May 1, 2025
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
2 changes: 0 additions & 2 deletions sim/hunter/aimed_shot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ func (hunter *Hunter) getAimedShotConfig(rank int, timer *core.Timer) core.Spell
},
},

CritDamageBonus: hunter.mortalShots(),

DamageMultiplier: 1,
ThreatMultiplier: 1,
BonusCoefficient: 1,
Expand Down
2 changes: 0 additions & 2 deletions sim/hunter/arcane_shot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ func (hunter *Hunter) getArcaneShotConfig(rank int, timer *core.Timer) core.Spel
},
},

CritDamageBonus: hunter.mortalShots(),

DamageMultiplier: 1,
ThreatMultiplier: 1,
BonusCoefficient: spellCoeff,
Expand Down
2 changes: 0 additions & 2 deletions sim/hunter/chimera_shot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ func (hunter *Hunter) registerChimeraShotSpell() {
},
},

CritDamageBonus: hunter.mortalShots(),

DamageMultiplier: 1.35,
ThreatMultiplier: 1,

Expand Down
66 changes: 33 additions & 33 deletions sim/hunter/dps_hunter/TestMM.results
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ stat_weights_results: {
key: "TestMM-Phase2-Lvl40-StatWeights-Default"
value: {
weights: 0
weights: 1.02802
weights: 1.03284
weights: 0
weights: 0
weights: 0
Expand All @@ -215,8 +215,8 @@ stat_weights_results: {
weights: 0
weights: 0
weights: 0
weights: 6.41436
weights: 7.41487
weights: 6.39407
weights: 7.39954
weights: 0
weights: 0
weights: 0
Expand Down Expand Up @@ -407,106 +407,106 @@ dps_results: {
dps_results: {
key: "TestMM-Phase2-Lvl40-AllItems-SignetofBeasts-209823"
value: {
dps: 666.81495
tps: 522.30736
dps: 666.60704
tps: 522.09223
}
}
dps_results: {
key: "TestMM-Phase2-Lvl40-Average-Default"
value: {
dps: 671.17309
tps: 524.49444
dps: 670.86557
tps: 524.18547
}
}
dps_results: {
key: "TestMM-Phase2-Lvl40-Settings-Dwarf-p2_ranged_mm-Basic-p2_ranged_mm-FullBuffs-P2-Consumes-LongMultiTarget"
value: {
dps: 1365.79714
tps: 1528.33893
dps: 1365.6887
tps: 1528.23048
}
}
dps_results: {
key: "TestMM-Phase2-Lvl40-Settings-Dwarf-p2_ranged_mm-Basic-p2_ranged_mm-FullBuffs-P2-Consumes-LongSingleTarget"
value: {
dps: 670.60794
tps: 530.41344
dps: 670.15779
tps: 529.95606
}
}
dps_results: {
key: "TestMM-Phase2-Lvl40-Settings-Dwarf-p2_ranged_mm-Basic-p2_ranged_mm-FullBuffs-P2-Consumes-ShortSingleTarget"
value: {
dps: 668.92476
tps: 521.30376
dps: 668.74402
tps: 521.08687
}
}
dps_results: {
key: "TestMM-Phase2-Lvl40-Settings-Dwarf-p2_ranged_mm-Basic-p2_ranged_mm-NoBuffs-P2-Consumes-LongMultiTarget"
value: {
dps: 778.73499
tps: 1013.81194
dps: 778.69795
tps: 1013.7749
}
}
dps_results: {
key: "TestMM-Phase2-Lvl40-Settings-Dwarf-p2_ranged_mm-Basic-p2_ranged_mm-NoBuffs-P2-Consumes-LongSingleTarget"
value: {
dps: 363.67357
tps: 305.94296
dps: 363.42197
tps: 305.69136
}
}
dps_results: {
key: "TestMM-Phase2-Lvl40-Settings-Dwarf-p2_ranged_mm-Basic-p2_ranged_mm-NoBuffs-P2-Consumes-ShortSingleTarget"
value: {
dps: 384.83662
tps: 314.78999
dps: 384.71905
tps: 314.67241
}
}
dps_results: {
key: "TestMM-Phase2-Lvl40-Settings-Orc-p2_ranged_mm-Basic-p2_ranged_mm-FullBuffs-P2-Consumes-LongMultiTarget"
value: {
dps: 1360.19107
tps: 1524.56402
dps: 1359.91267
tps: 1524.28562
}
}
dps_results: {
key: "TestMM-Phase2-Lvl40-Settings-Orc-p2_ranged_mm-Basic-p2_ranged_mm-FullBuffs-P2-Consumes-LongSingleTarget"
value: {
dps: 676.61145
tps: 530.34874
dps: 676.30409
tps: 530.03415
}
}
dps_results: {
key: "TestMM-Phase2-Lvl40-Settings-Orc-p2_ranged_mm-Basic-p2_ranged_mm-FullBuffs-P2-Consumes-ShortSingleTarget"
value: {
dps: 678.40241
tps: 523.99473
dps: 678.04093
tps: 523.59711
}
}
dps_results: {
key: "TestMM-Phase2-Lvl40-Settings-Orc-p2_ranged_mm-Basic-p2_ranged_mm-NoBuffs-P2-Consumes-LongMultiTarget"
value: {
dps: 779.68861
tps: 1004.4076
dps: 779.52872
tps: 1004.2477
}
}
dps_results: {
key: "TestMM-Phase2-Lvl40-Settings-Orc-p2_ranged_mm-Basic-p2_ranged_mm-NoBuffs-P2-Consumes-LongSingleTarget"
value: {
dps: 368.59748
tps: 306.36057
dps: 368.38114
tps: 306.14424
}
}
dps_results: {
key: "TestMM-Phase2-Lvl40-Settings-Orc-p2_ranged_mm-Basic-p2_ranged_mm-NoBuffs-P2-Consumes-ShortSingleTarget"
value: {
dps: 388.27847
tps: 313.93332
dps: 388.1609
tps: 313.81575
}
}
dps_results: {
key: "TestMM-Phase2-Lvl40-SwitchInFrontOfTarget-Default"
value: {
dps: 668.59727
tps: 529.32523
dps: 667.98344
tps: 528.70418
}
}
dps_results: {
Expand Down
2 changes: 0 additions & 2 deletions sim/hunter/explosive_shot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@ func (hunter *Hunter) registerExplosiveShotSpell() {
},
},

CritDamageBonus: hunter.mortalShots(),

DamageMultiplier: 1,
ThreatMultiplier: 1,

Expand Down
2 changes: 0 additions & 2 deletions sim/hunter/flanking_strike.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ func (hunter *Hunter) registerFlankingStrikeSpell() {
ProcMask: core.ProcMaskMeleeMHSpecial,
Flags: core.SpellFlagMeleeMetrics,

CritDamageBonus: hunter.mortalShots(),
DamageMultiplier: 1,
BonusCoefficient: 1,

Expand Down Expand Up @@ -80,7 +79,6 @@ func (hunter *Hunter) registerFlankingStrikeSpell() {
},
},

CritDamageBonus: hunter.mortalShots(),
DamageMultiplier: 1,
BonusCoefficient: 1,

Expand Down
2 changes: 1 addition & 1 deletion sim/hunter/hunter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ func NewHunter(character *core.Character, options *proto.Player) *Hunter {
return time.Duration(float64(spell.DefaultCast.CastTime) / hunter.RangedSwingSpeed() * math.Max(spell.CastTimeMultiplier, 0))
},
}
hunter.AutoAttacks.RangedConfig().CritDamageBonus = hunter.mortalShots()
hunter.AutoAttacks.RangedConfig().CritDamageBonus = 0.06 * float64(hunter.Talents.MortalShots)
Copy link
Collaborator

@kayla-glick kayla-glick May 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we move this to within the mortal shots talent code?

hunter.AutoAttacks.RangedConfig().BonusCoefficient = 1
hunter.AutoAttacks.RangedConfig().ApplyEffects = func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
baseDamage := hunter.RangedWeaponDamage(sim, spell.RangedAttackPower(target, false)) +
Expand Down
2 changes: 0 additions & 2 deletions sim/hunter/kill_shot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ func (hunter *Hunter) newKillShotConfig() core.SpellConfig {
},
},

CritDamageBonus: hunter.mortalShots(),

DamageMultiplier: 1,
ThreatMultiplier: 1,
BonusCoefficient: 1,
Expand Down
1 change: 0 additions & 1 deletion sim/hunter/mongoose_bite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ func (hunter *Hunter) getMongooseBiteConfig(rank int) core.SpellConfig {
return hunter.DefensiveState.IsActive()
},

CritDamageBonus: hunter.mortalShots(),
DamageMultiplier: 1,
ThreatMultiplier: 1,

Expand Down
2 changes: 0 additions & 2 deletions sim/hunter/multi_shot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@ func (hunter *Hunter) getMultiShotConfig(rank int, timer *core.Timer) core.Spell
},
},

CritDamageBonus: hunter.mortalShots(),

DamageMultiplier: 1,
ThreatMultiplier: 1,
BonusCoefficient: 1,
Expand Down
1 change: 0 additions & 1 deletion sim/hunter/raptor_strike.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ func (hunter *Hunter) newRaptorStrikeHitSpell(rank int, isMH bool) *core.Spell {
ProcMask: procMask,
Flags: core.SpellFlagMeleeMetrics | core.SpellFlagNoOnCastComplete,

CritDamageBonus: hunter.mortalShots(),
DamageMultiplier: damageMultiplier,
BonusCoefficient: 1,

Expand Down
4 changes: 0 additions & 4 deletions sim/hunter/serpent_sting.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,6 @@ func (hunter *Hunter) chimeraShotSerpentStingSpell(rank int) *core.Spell {
Flags: core.SpellFlagMeleeMetrics | core.SpellFlagPassiveSpell,
MissileSpeed: 24,

BonusCritRating: 1,

CritDamageBonus: hunter.mortalShots(),

DamageMultiplier: 1,
ThreatMultiplier: 1,
BonusCoefficient: 0.40,
Expand Down
2 changes: 0 additions & 2 deletions sim/hunter/steady_shot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ func (hunter *Hunter) registerSteadyShotSpell() {
},
},

CritDamageBonus: hunter.mortalShots(),

DamageMultiplier: 1,
ThreatMultiplier: 1,

Expand Down
13 changes: 7 additions & 6 deletions sim/hunter/talents.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ func (hunter *Hunter) ApplyTalents() {
// MM Talents
hunter.applyEfficiency()
hunter.applyLethalShots()
hunter.applyMortalShots()
hunter.applyImprovedArcaneShot()
hunter.applyImprovedSerpentSting()
hunter.applyBarrage()
Expand Down Expand Up @@ -222,8 +223,12 @@ func (hunter *Hunter) applyMortalShots() {
return
}

// TODO: Figure out what the pattern is and move to here
// Could it be ProcMask Ranged + BonusCoefficient 1?
hunter.AddStaticMod(core.SpellModConfig{
Kind: core.SpellMod_CritDamageBonus_Flat,
// Applies to all shots, strikes, and volley
ClassMask: ClassSpellMask_HunterShots | ClassSpellMask_HunterStrikes | ClassSpellMask_HunterChimeraSerpent | ClassSpellMask_HunterMongooseBite | ClassSpellMask_HunterWingClip | ClassSpellMask_HunterVolley,
FloatValue: 0.06 * float64(hunter.Talents.MortalShots),
})
}

func (hunter *Hunter) applyBarrage() {
Expand Down Expand Up @@ -251,10 +256,6 @@ func (hunter *Hunter) applyRangedWeaponSpecialization() {
})
}

func (hunter *Hunter) mortalShots() float64 {
return 0.06 * float64(hunter.Talents.MortalShots)
}

///////////////////////////////////////////////////////////////////////////
// Survival Talents
///////////////////////////////////////////////////////////////////////////
Expand Down
1 change: 0 additions & 1 deletion sim/hunter/volley.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ func (hunter *Hunter) getVolleyConfig(rank int) core.SpellConfig {
},
},

CritDamageBonus: 1 + hunter.mortalShots(),
DamageMultiplier: 1,
ThreatMultiplier: 1,

Expand Down
1 change: 0 additions & 1 deletion sim/hunter/wing_clip.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ func (hunter *Hunter) getWingClipConfig(rank int) core.SpellConfig {
IgnoreHaste: true,
},

CritDamageBonus: hunter.mortalShots(),
DamageMultiplier: 1,
ThreatMultiplier: 1,

Expand Down
1 change: 0 additions & 1 deletion sim/hunter/wyvern_strike.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ func (hunter *Hunter) getWyvernStrikeConfig(rank int) core.SpellConfig {
},
},

CritDamageBonus: hunter.mortalShots(),
DamageMultiplier: 1,
BonusCoefficient: 1,
ThreatMultiplier: 1,
Expand Down
Loading