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

[Hunter] Cleanup and base damages #36

Merged
merged 11 commits into from
Mar 25, 2024
Merged

[Hunter] Cleanup and base damages #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
348b7ad
[Hunter] WIP Calculations
ToxicKevinFerm Mar 23, 2024
57a6ee4
Black Arrow
ToxicKevinFerm Mar 23, 2024
06e7f46
[Hunter] Merge
ToxicKevinFerm Mar 23, 2024
5286d48
[Hunter] Adjust BA and Explosive Shot calculations
ToxicKevinFerm Mar 23, 2024
8d448be
[Hunter] Fix Hunter AP Scaling
ToxicKevinFerm Mar 23, 2024
14f8ee1
[Hunter] Fix Cobra Shot, SS and Explosive Shot scaling
ToxicKevinFerm Mar 24, 2024
5b31c2a
[Hunter] Fix Bite scaling
ToxicKevinFerm Mar 24, 2024
98a108b
[Hunter] Fix Explosive Shot and LnL maybe
ToxicKevinFerm Mar 24, 2024
602490c
[Hunter] Update SV Tests
ToxicKevinFerm Mar 24, 2024
f3274fe
[Hunter] Remove Strength stat dependency and fix serpent sting initia…
ToxicKevinFerm Mar 24, 2024
ef0b56c
[Hunter] Update Tests
ToxicKevinFerm Mar 24, 2024
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: 1 addition & 1 deletion sim/hunter/arcane_shot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func (hunter *Hunter) registerArcaneShotSpell() {

ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
wepDmg := hunter.AutoAttacks.Ranged().CalculateNormalizedWeaponDamage(sim, spell.RangedAttackPower(target))
baseDamage := wepDmg + (0.0483 * spell.RangedAttackPower(target))
baseDamage := wepDmg + (0.0483 * spell.RangedAttackPower(target)) + 289.859

result := spell.CalcDamage(sim, target, baseDamage, spell.OutcomeRangedHitAndCrit)

Expand Down
4 changes: 2 additions & 2 deletions sim/hunter/cobra_shot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ func (hunter *Hunter) registerCobraShotSpell() {
ThreatMultiplier: 1,

ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
baseDamage := hunter.AutoAttacks.Ranged().CalculateNormalizedWeaponDamage(sim, spell.RangedAttackPower(target)) + (277.21 + spell.RangedAttackPower(target)*0.017)
baseDamage := hunter.AutoAttacks.Ranged().CalculateNormalizedWeaponDamage(sim, spell.RangedAttackPower(target)) + (276.806 + spell.RangedAttackPower(target)*0.017)
focus := 9.0
if hunter.Talents.Termination != 0 && sim.IsExecutePhase25() {
focus = float64(hunter.Talents.Termination) * 3
}
hunter.AddFocus(sim, focus, csMetrics)
if hunter.SerpentSting.Dot(target).IsActive() {
hunter.SerpentSting.Dot(target).Refresh(sim) // Refresh to cause new total snapshot
hunter.SerpentSting.Dot(target).Rollover(sim) // Refresh to cause new total snapshot
}
result := spell.CalcDamage(sim, target, baseDamage, spell.OutcomeRangedHitAndCrit)

Expand Down
5 changes: 2 additions & 3 deletions sim/hunter/hunter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,9 +178,8 @@ func NewHunter(character *core.Character, options *proto.Player, hunterOptions *
}
hunter.Pet = hunter.NewHunterPet()

hunter.AddStatDependency(stats.Strength, stats.AttackPower, 1)
hunter.AddStatDependency(stats.Agility, stats.AttackPower, 1)
hunter.AddStatDependency(stats.Agility, stats.RangedAttackPower, 1)
hunter.AddStatDependency(stats.Agility, stats.AttackPower, 2)
hunter.AddStatDependency(stats.Agility, stats.RangedAttackPower, 2)
hunter.AddStatDependency(stats.Agility, stats.MeleeCrit, core.CritPerAgiMaxLevel[character.Class]*core.CritRatingPerCritChance)

return hunter
Expand Down
2 changes: 1 addition & 1 deletion sim/hunter/kill_command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func (hunter *Hunter) registerKillCommandSpell() {
CritMultiplier: hunter.CritMultiplier(false, false, false),
ThreatMultiplier: 1,
ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
baseDamage := 0.516*spell.RangedAttackPower(target) + 918 //Todo: fix calc
baseDamage := 0.516*spell.RangedAttackPower(target) + 922
spell.CalcAndDealDamage(sim, target, baseDamage, spell.OutcomeRangedHitAndCrit)
},
})
Expand Down
2 changes: 1 addition & 1 deletion sim/hunter/kill_shot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func (hunter *Hunter) registerKillShotSpell() {

BonusCritRating: 0 + 5*core.CritRatingPerCritChance*float64(hunter.Talents.SniperTraining),
DamageMultiplier: 1.5, //
CritMultiplier: 1, // hunter.critMultiplier(true, true, false),
CritMultiplier: hunter.CritMultiplier(true, true, false),
ThreatMultiplier: 1,
// https://web.archive.org/web/20120207222124/http://elitistjerks.com/f74/t110306-hunter_faq_cataclysm_edition_read_before_asking_questions/
ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
Expand Down
2 changes: 1 addition & 1 deletion sim/hunter/marksmanship/chimera_shot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func (hunter *MarksmanshipHunter) registerChimeraShotSpell() {

ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
wepDmg := hunter.AutoAttacks.Ranged().CalculateNormalizedWeaponDamage(sim, spell.RangedAttackPower(target))
baseDamage := 0.732*spell.RangedAttackPower(target) + 1620
baseDamage := 0.732*spell.RangedAttackPower(target) + 1620.33

result := spell.CalcDamage(sim, target, wepDmg+baseDamage, spell.OutcomeRangedHitAndCrit)

Expand Down
2 changes: 1 addition & 1 deletion sim/hunter/multi_shot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func (hunter *Hunter) registerMultiShotSpell() {

BonusCritRating: 0,
DamageMultiplierAdditive: 1,
DamageMultiplier: 1.2,
DamageMultiplier: 1.21,
CritMultiplier: hunter.CritMultiplier(true, false, false),
ThreatMultiplier: 1,

Expand Down
5 changes: 2 additions & 3 deletions sim/hunter/pet_abilities.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,13 +134,12 @@ func (hp *HunterPet) newFocusDump(pat PetAbilityType, spellID int32) *core.Spell
IgnoreHaste: true,
},

//DamageMultiplier: 1 * hp.hunterOwner.markedForDeathMultiplier(),
DamageMultiplier: 1,
CritMultiplier: 2,
ThreatMultiplier: 1,

ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
baseDamage := sim.Roll(118, 168) + 0.07*spell.MeleeAttackPower()
//baseDamage *= hp.killCommandMult() //Todo: kill command doesnt work lik ethis anymore
baseDamage := sim.Roll(132, 188) + ((0.4 * spell.MeleeAttackPower()) * 0.20)
spell.CalcAndDealDamage(sim, target, baseDamage, spell.OutcomeMeleeSpecialHitAndCrit)
},
})
Expand Down
10 changes: 5 additions & 5 deletions sim/hunter/serpent_sting.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ func (hunter *Hunter) registerSerpentStingSpell() {
},
BonusCritRating: impSSCritChance + core.TernaryFloat64(hunter.HasPrimeGlyph(proto.HunterPrimeGlyph_GlyphOfSerpentSting), 6, 0)*core.CritRatingPerCritChance,

DamageMultiplierAdditive: 1 + 0.15*float64(hunter.Talents.ImprovedSerpentSting),
DamageMultiplier: 1 + 0.15*float64(hunter.Talents.ImprovedSerpentSting),
// SS uses Spell Crit which is multiplied by toxicology
CritMultiplier: hunter.SpellCritMultiplier(1, float64(hunter.Talents.Toxicology)*0.5),
ThreatMultiplier: 1,

Dot: core.DotConfig{
Aura: core.Aura{
Label: "SerpentSting",
Label: "SerpentStingDot",
Tag: "SerpentSting",
OnGain: func(aura *core.Aura, sim *core.Simulation) {
hunter.AttackTables[aura.Unit.UnitIndex].DamageTakenMultiplier *= noxiousStingsMultiplier
Expand All @@ -51,7 +51,7 @@ func (hunter *Hunter) registerSerpentStingSpell() {
TickLength: time.Second * 3,

OnSnapshot: func(sim *core.Simulation, target *core.Unit, dot *core.Dot, isRollover bool) {
dot.SnapshotBaseDamage = (460 + 0.40*dot.Spell.RangedAttackPower(target)) / 5
dot.SnapshotBaseDamage = 460 + 0.08*dot.Spell.RangedAttackPower(target)
attackTable := dot.Spell.Unit.AttackTables[target.UnitIndex]
dot.SnapshotCritChance = dot.Spell.PhysicalCritChance(attackTable)
dot.SnapshotAttackerMultiplier = dot.Spell.AttackerDamageMultiplier(attackTable)
Expand All @@ -66,8 +66,8 @@ func (hunter *Hunter) registerSerpentStingSpell() {
var result *core.SpellResult

if hunter.Talents.ImprovedSerpentSting != 0 {
baseDamage := 460 + 0.40*spell.RangedAttackPower(target)
result = spell.CalcDamage(sim, target, baseDamage*float64(hunter.Talents.ImprovedSerpentSting), spell.OutcomeRangedHitAndCrit)
baseDamage := (460 * 5) + 0.40*spell.RangedAttackPower(target)
result = spell.CalcDamage(sim, target, baseDamage, spell.OutcomeRangedHitAndCrit)
} else {
result = spell.CalcOutcome(sim, target, spell.OutcomeRangedHitAndCrit)
}
Expand Down
2 changes: 1 addition & 1 deletion sim/hunter/steady_shot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func (hunter *Hunter) registerSteadyShotSpell() {
ThreatMultiplier: 1,

ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
baseDamage := hunter.AutoAttacks.Ranged().CalculateNormalizedWeaponDamage(sim, spell.RangedAttackPower(target)) + (280 + spell.RangedAttackPower(target)*0.021)
baseDamage := hunter.AutoAttacks.Ranged().CalculateNormalizedWeaponDamage(sim, spell.RangedAttackPower(target)) + (280.182 + spell.RangedAttackPower(target)*0.021)
focus := 9.0
if hunter.Talents.Termination != 0 && sim.IsExecutePhase25() {
focus = float64(hunter.Talents.Termination) * 3
Expand Down
Loading
Loading