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

update pet scaling/ability values #12

Merged
merged 3 commits into from
Feb 2, 2024
Merged

update pet scaling/ability values #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c4cc72
update pet scaling/ability values
rosenrusinov Feb 2, 2024
9aaf51b
move hunter to alpha
rosenrusinov Feb 2, 2024
4b23c74
update warlock tests
rosenrusinov Feb 2, 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/flanking_strike.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ func (hunter *Hunter) registerFlankingStrikeSpell() {
Flags: core.SpellFlagMeleeMetrics | core.SpellFlagIncludeTargetBonusDamage,

BonusCritRating: 0,
DamageMultiplier: 1,
DamageMultiplier: 0.5,
CritMultiplier: hunter.pet.MeleeCritMultiplier(1, 0),

ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
Expand Down
59 changes: 34 additions & 25 deletions sim/hunter/pet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,23 +48,26 @@ func (hunter *Hunter) NewHunterPet() *HunterPet {
hasOwnerCooldown: petConfig.SpecialAbility == FuriousHowl,
}

atkSpd := 2.0 // / (1 + 0.15*float64(hp.Talents().CobraReflexes))
hp.EnableAutoAttacks(hp, core.AutoAttackOptions{
MainHand: core.Weapon{
BaseDamageMin: 27,
BaseDamageMax: 37,
SwingSpeed: atkSpd,
CritMultiplier: 2,
SwingSpeed: 2.0,
CritMultiplier: hp.MeleeCritMultiplier(1, 0),
},
AutoSwingMelee: true,
})

// After checking numerous logs it seems pet auto attacks are hitting for less then what they should if following standard attack formulas
// TODO: Figure out from where this difference comes
hp.AutoAttacks.MHConfig().DamageMultiplier *= 0.6

// Happiness
hp.PseudoStats.DamageDealtMultiplier *= 1.25

// Family scalars
hp.PseudoStats.SchoolDamageDealtMultiplier[stats.SchoolIndexPhysical] *= hp.config.Damage
hp.PseudoStats.ArmorMultiplier *= hp.config.Armor

hp.MultiplyStat(stats.Health, hp.config.Health)

hp.AddStatDependency(stats.Strength, stats.AttackPower, 2)
Expand Down Expand Up @@ -100,6 +103,9 @@ func (hp *HunterPet) Initialize() {
hp.OnGCDReady(sim)
}
})

// TODO: Make this dynamic
hp.PseudoStats.DamageDealtMultiplier *= hp.Owner.PseudoStats.DamageDealtMultiplier
}

func (hp *HunterPet) Reset(_ *core.Simulation) {
Expand Down Expand Up @@ -176,9 +182,12 @@ func (hunter *Hunter) makeStatInheritance() core.PetStatInheritance {
stats.Armor: ownerStats[stats.Armor] * 0.35,
stats.AttackPower: ownerStats[stats.RangedAttackPower] * 0.22,

stats.MeleeHit: hitRatingFromOwner,
stats.SpellHit: hitRatingFromOwner * 2,
stats.Expertise: ownerHitChance * PetExpertiseScale * core.ExpertisePerQuarterPercentReduction,
stats.MeleeCrit: ownerStats[stats.MeleeCrit],
stats.SpellCrit: ownerStats[stats.MeleeCrit],

stats.MeleeHit: hitRatingFromOwner,
stats.SpellHit: hitRatingFromOwner * 2,
//stats.Expertise: ownerHitChance * PetExpertiseScale * core.ExpertisePerQuarterPercentReduction,
}
}
}
Expand All @@ -200,6 +209,24 @@ type PetConfig struct {
// Abilities reference: https://wotlk.wowhead.com/hunter-pets
// https://wotlk.wowhead.com/guides/hunter-dps-best-pets-taming-loyalty-burning-crusade-classic
var PetConfigs = map[proto.Hunter_Options_PetType]PetConfig{
proto.Hunter_Options_Cat: {
Name: "Cat",
SpecialAbility: Bite,
FocusDump: Claw,

Health: 1.0,
Armor: 1.0,
Damage: 1.1,
},
proto.Hunter_Options_WindSerpent: {
Name: "Wind Serpent",
SpecialAbility: Unknown,
FocusDump: LightningBreath,

Health: 1.0,
Armor: 1.0,
Damage: 1.07,
},
proto.Hunter_Options_Bat: {
Name: "Bat",
//SpecialAbility: SonicBlast,
Expand Down Expand Up @@ -236,15 +263,6 @@ var PetConfigs = map[proto.Hunter_Options_PetType]PetConfig{
Armor: 1.0,
Damage: 1.0,
},
proto.Hunter_Options_Cat: {
Name: "Cat",
SpecialAbility: Unknown,
FocusDump: Claw,

Health: 1.0,
Armor: 1.0,
Damage: 1.1,
},
proto.Hunter_Options_Chimaera: {
Name: "Chimaera",
//SpecialAbility: FroststormBreath,
Expand Down Expand Up @@ -398,15 +416,6 @@ var PetConfigs = map[proto.Hunter_Options_PetType]PetConfig{
Armor: 1.0,
Damage: 1.0,
},
proto.Hunter_Options_WindSerpent: {
Name: "Wind Serpent",
SpecialAbility: LightningBreath,
FocusDump: Bite,

Health: 1.0,
Armor: 1.0,
Damage: 1.0,
},
proto.Hunter_Options_Wolf: {
Name: "Wolf",
SpecialAbility: FuriousHowl,
Expand Down
Loading
Loading