From 85185aa0b3b382d32097a0a797367ba276b930e8 Mon Sep 17 00:00:00 2001 From: Horatio Date: Thu, 13 Apr 2023 08:36:23 -0300 Subject: [PATCH 1/6] Updated Fire Ele stats/spell damage/coeff, added orc racial and handled draenei racial --- sim/shaman/fire_elemental_pet.go | 18 ++++++++++++++---- sim/shaman/fire_elemental_spells.go | 9 +++------ sim/shaman/shaman.go | 3 +++ 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/sim/shaman/fire_elemental_pet.go b/sim/shaman/fire_elemental_pet.go index 9e2cf90708..43611e00a8 100644 --- a/sim/shaman/fire_elemental_pet.go +++ b/sim/shaman/fire_elemental_pet.go @@ -5,6 +5,7 @@ import ( "time" "github.com/wowsims/wotlk/sim/core" + "github.com/wowsims/wotlk/sim/core/proto" "github.com/wowsims/wotlk/sim/core/stats" ) @@ -47,6 +48,15 @@ func (shaman *Shaman) NewFireElemental() *FireElemental { fireElemental.OnPetEnable = fireElemental.enable fireElemental.OnPetDisable = fireElemental.disable + if shaman.hasHeroicPresence { + fireElemental.AddStats(stats.Stats{ + stats.MeleeHit: -1 * core.MeleeHitRatingPerHitChance, + stats.SpellHit: -1 * core.SpellHitRatingPerHitChance, + }) + } else if shaman.Race == proto.Race_RaceOrc { + fireElemental.PseudoStats.DamageDealtMultiplier *= 1.05 + } + shaman.AddPet(fireElemental) return fireElemental @@ -134,8 +144,8 @@ var fireElementalPetBaseStats = stats.Stats{ stats.Health: 994, stats.Intellect: 147, stats.Stamina: 327, - stats.SpellPower: 995, //Estimated - stats.AttackPower: 1369, //Estimated + stats.SpellPower: 0, //Estimated + stats.AttackPower: 1303, //Estimated // TODO : Log digging and my own samples this seems to be around the 5% mark. stats.MeleeCrit: (5 + 1.8) * core.CritRatingPerCritChance, @@ -152,8 +162,8 @@ func (shaman *Shaman) fireElementalStatInheritance() core.PetStatInheritance { return stats.Stats{ stats.Stamina: ownerStats[stats.Stamina] * 0.75, stats.Intellect: ownerStats[stats.Intellect] * 0.30, - stats.SpellPower: ownerStats[stats.SpellPower] * 0.5218, - stats.AttackPower: ownerStats[stats.SpellPower] * 4.45, + stats.SpellPower: ownerStats[stats.SpellPower] * 0.4970, + stats.AttackPower: ownerStats[stats.SpellPower] * 4.2381, // TODO tested useing pre-patch lvl 70 stats need to confirm in WOTLK at 80. stats.MeleeHit: hitRatingFromOwner, diff --git a/sim/shaman/fire_elemental_spells.go b/sim/shaman/fire_elemental_spells.go index 876610e148..ae1dc0d259 100644 --- a/sim/shaman/fire_elemental_spells.go +++ b/sim/shaman/fire_elemental_spells.go @@ -32,7 +32,7 @@ func (fireElemental *FireElemental) registerFireBlast() { ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) { // TODO these are approximation, from base SP - baseDamage := sim.Roll(323, 459) + 0.429*spell.SpellPower() + baseDamage := sim.Roll(714, 844) + 0.429*spell.SpellPower() spell.CalcAndDealDamage(sim, target, baseDamage, spell.OutcomeMagicHitAndCrit) }, }) @@ -64,11 +64,8 @@ func (fireElemental *FireElemental) registerFireNova() { ThreatMultiplier: 1, ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) { - // TODO is this the right affect should it be Capped? - // TODO these are approximation, from base SP - dmgFromSP := 1.0071 * spell.SpellPower() for _, aoeTarget := range sim.Encounter.TargetUnits { - baseDamage := sim.Roll(1, 150) + dmgFromSP + baseDamage := sim.Roll(955, 1098) + spell.SpellPower() baseDamage *= sim.Encounter.AOECapMultiplier() spell.CalcAndDealDamage(sim, aoeTarget, baseDamage, spell.OutcomeMagicHitAndCrit) } @@ -102,7 +99,7 @@ func (fireElemental *FireElemental) registerFireShieldAura() { // TODO these are approximation, from base SP dmgFromSP := 0.032 * dot.Spell.SpellPower() for _, aoeTarget := range sim.Encounter.TargetUnits { - baseDamage := sim.Roll(68, 70) + dmgFromSP + baseDamage := sim.Roll(95, 97) + dmgFromSP //baseDamage *= sim.Encounter.AOECapMultiplier() dot.Spell.CalcAndDealDamage(sim, aoeTarget, baseDamage, dot.Spell.OutcomeMagicCrit) } diff --git a/sim/shaman/shaman.go b/sim/shaman/shaman.go index 2d4500b859..7508be828b 100644 --- a/sim/shaman/shaman.go +++ b/sim/shaman/shaman.go @@ -139,6 +139,8 @@ type Shaman struct { EarthShield *core.Spell waterShieldManaMetrics *core.ResourceMetrics + + hasHeroicPresence bool } // Implemented by each Shaman spec. @@ -213,6 +215,7 @@ func (shaman *Shaman) AddPartyBuffs(partyBuffs *proto.PartyBuffs) { if shaman.Talents.ManaTideTotem { partyBuffs.ManaTideTotems++ } + shaman.hasHeroicPresence = partyBuffs.HeroicPresence } func (shaman *Shaman) Initialize() { From 2307178b0d1b41e1aea863818628c4d543af7973 Mon Sep 17 00:00:00 2001 From: Horatio Date: Thu, 13 Apr 2023 08:40:48 -0300 Subject: [PATCH 2/6] updated test's --- sim/shaman/elemental/TestElemental.results | 24 +++++----- .../enhancement/TestEnhancement.results | 48 +++++++++---------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/sim/shaman/elemental/TestElemental.results b/sim/shaman/elemental/TestElemental.results index 3fcf238ab9..a524c3f3e2 100644 --- a/sim/shaman/elemental/TestElemental.results +++ b/sim/shaman/elemental/TestElemental.results @@ -1046,42 +1046,42 @@ dps_results: { dps_results: { key: "TestElemental-Settings-Orc-P1-EleFireElemental-FullBuffs-LongMultiTarget" value: { - dps: 14181.88558 + dps: 14173.29137 tps: 8588.51365 } } dps_results: { key: "TestElemental-Settings-Orc-P1-EleFireElemental-FullBuffs-LongSingleTarget" value: { - dps: 7154.18079 + dps: 7153.38176 tps: 4122.21165 } } dps_results: { key: "TestElemental-Settings-Orc-P1-EleFireElemental-FullBuffs-ShortSingleTarget" value: { - dps: 8857.82365 + dps: 8855.35662 tps: 4683.59979 } } dps_results: { key: "TestElemental-Settings-Orc-P1-EleFireElemental-NoBuffs-LongMultiTarget" value: { - dps: 6229.3835 + dps: 6222.66162 tps: 2925.15189 } } dps_results: { key: "TestElemental-Settings-Orc-P1-EleFireElemental-NoBuffs-LongSingleTarget" value: { - dps: 3581.95866 + dps: 3581.34432 tps: 1968.54623 } } dps_results: { key: "TestElemental-Settings-Orc-P1-EleFireElemental-NoBuffs-ShortSingleTarget" value: { - dps: 6460.53098 + dps: 6458.68414 tps: 3309.86199 } } @@ -1130,42 +1130,42 @@ dps_results: { dps_results: { key: "TestElemental-Settings-Troll-P1-EleFireElemental-FullBuffs-LongMultiTarget" value: { - dps: 13963.90274 + dps: 13830.16021 tps: 8584.61049 } } dps_results: { key: "TestElemental-Settings-Troll-P1-EleFireElemental-FullBuffs-LongSingleTarget" value: { - dps: 7111.30605 + dps: 7081.18721 tps: 4131.75161 } } dps_results: { key: "TestElemental-Settings-Troll-P1-EleFireElemental-FullBuffs-ShortSingleTarget" value: { - dps: 8680.60554 + dps: 8611.24841 tps: 4629.68545 } } dps_results: { key: "TestElemental-Settings-Troll-P1-EleFireElemental-NoBuffs-LongMultiTarget" value: { - dps: 6025.15209 + dps: 5916.28149 tps: 2912.70974 } } dps_results: { key: "TestElemental-Settings-Troll-P1-EleFireElemental-NoBuffs-LongSingleTarget" value: { - dps: 3534.63809 + dps: 3510.33353 tps: 1964.09774 } } dps_results: { key: "TestElemental-Settings-Troll-P1-EleFireElemental-NoBuffs-ShortSingleTarget" value: { - dps: 6292.46923 + dps: 6237.19996 tps: 3246.08012 } } diff --git a/sim/shaman/enhancement/TestEnhancement.results b/sim/shaman/enhancement/TestEnhancement.results index bbcddea585..97e9827d59 100644 --- a/sim/shaman/enhancement/TestEnhancement.results +++ b/sim/shaman/enhancement/TestEnhancement.results @@ -1002,84 +1002,84 @@ dps_results: { dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhFireElemental-FullBuffs-LongMultiTarget" value: { - dps: 21727.77965 + dps: 21719.68471 tps: 12408.13762 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhFireElemental-FullBuffs-LongSingleTarget" value: { - dps: 7736.74931 + dps: 7735.99363 tps: 4120.26715 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhFireElemental-FullBuffs-ShortSingleTarget" value: { - dps: 9455.7919 + dps: 9453.71834 tps: 4476.99794 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhFireElemental-NoBuffs-LongMultiTarget" value: { - dps: 11123.23932 + dps: 11119.15906 tps: 6720.58488 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhFireElemental-NoBuffs-LongSingleTarget" value: { - dps: 4232.17662 + dps: 4231.84096 tps: 2196.44289 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhFireElemental-NoBuffs-ShortSingleTarget" value: { - dps: 5809.81371 + dps: 5808.51702 tps: 2717.55572 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhItemSwap-FullBuffs-LongMultiTarget" value: { - dps: 21371.19353 + dps: 21364.54218 tps: 12395.32962 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhItemSwap-FullBuffs-LongSingleTarget" value: { - dps: 7565.3136 + dps: 7564.719 tps: 4079.07975 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhItemSwap-FullBuffs-ShortSingleTarget" value: { - dps: 9153.38453 + dps: 9151.63489 tps: 4395.58947 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhItemSwap-NoBuffs-LongMultiTarget" value: { - dps: 10697.11423 + dps: 10694.25616 tps: 6606.5281 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhItemSwap-NoBuffs-LongSingleTarget" value: { - dps: 4120.88171 + dps: 4120.6628 tps: 2176.47297 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhItemSwap-NoBuffs-ShortSingleTarget" value: { - dps: 5580.18368 + dps: 5579.18411 tps: 2673.24479 } } @@ -1128,84 +1128,84 @@ dps_results: { dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhFireElemental-FullBuffs-LongMultiTarget" value: { - dps: 21531.63802 + dps: 21405.98106 tps: 12448.78077 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhFireElemental-FullBuffs-LongSingleTarget" value: { - dps: 7696.16253 + dps: 7668.70236 tps: 4155.65471 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhFireElemental-FullBuffs-ShortSingleTarget" value: { - dps: 9373.9797 + dps: 9313.43701 tps: 4551.18634 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhFireElemental-NoBuffs-LongMultiTarget" value: { - dps: 10930.99097 + dps: 10852.80472 tps: 6657.71133 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhFireElemental-NoBuffs-LongSingleTarget" value: { - dps: 4209.14296 + dps: 4190.15915 tps: 2224.78399 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhFireElemental-NoBuffs-ShortSingleTarget" value: { - dps: 5769.07802 + dps: 5727.09432 tps: 2774.14513 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhItemSwap-FullBuffs-LongMultiTarget" value: { - dps: 21127.58077 + dps: 21016.78241 tps: 12358.86801 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhItemSwap-FullBuffs-LongSingleTarget" value: { - dps: 7519.99098 + dps: 7496.29021 tps: 4092.18873 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhItemSwap-FullBuffs-ShortSingleTarget" value: { - dps: 8955.52501 + dps: 8902.36719 tps: 4384.58019 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhItemSwap-NoBuffs-LongMultiTarget" value: { - dps: 10650.56735 + dps: 10586.27035 tps: 6736.75305 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhItemSwap-NoBuffs-LongSingleTarget" value: { - dps: 4042.41912 + dps: 4026.63236 tps: 2162.264 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhItemSwap-NoBuffs-ShortSingleTarget" value: { - dps: 5376.88044 + dps: 5341.23414 tps: 2626.88105 } } From cd20c79a570dfa72c8013fe492301c625c14e087 Mon Sep 17 00:00:00 2001 From: Horatio Date: Thu, 13 Apr 2023 10:58:46 -0300 Subject: [PATCH 3/6] Small adjustment to meele BaseDamageMax for Fire Ele --- sim/shaman/fire_elemental_pet.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sim/shaman/fire_elemental_pet.go b/sim/shaman/fire_elemental_pet.go index 43611e00a8..80fe62c13c 100644 --- a/sim/shaman/fire_elemental_pet.go +++ b/sim/shaman/fire_elemental_pet.go @@ -36,7 +36,7 @@ func (shaman *Shaman) NewFireElemental() *FireElemental { fireElemental.EnableAutoAttacks(fireElemental, core.AutoAttackOptions{ MainHand: core.Weapon{ BaseDamageMin: 1, // Estimated from base AP - BaseDamageMax: 24, // Estimated from base AP + BaseDamageMax: 23, // Estimated from base AP SwingSpeed: 2, SwingDuration: time.Second * 2, CritMultiplier: 2, // Pretty sure this is right. From 4709fe87dd5fd57dd69235902f66663831d325a0 Mon Sep 17 00:00:00 2001 From: Horatio Date: Thu, 13 Apr 2023 11:14:03 -0300 Subject: [PATCH 4/6] updated test's --- sim/shaman/elemental/TestElemental.results | 24 +++++----- .../enhancement/TestEnhancement.results | 48 +++++++++---------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/sim/shaman/elemental/TestElemental.results b/sim/shaman/elemental/TestElemental.results index a524c3f3e2..afe792c1e1 100644 --- a/sim/shaman/elemental/TestElemental.results +++ b/sim/shaman/elemental/TestElemental.results @@ -1046,42 +1046,42 @@ dps_results: { dps_results: { key: "TestElemental-Settings-Orc-P1-EleFireElemental-FullBuffs-LongMultiTarget" value: { - dps: 14173.29137 + dps: 14173.22856 tps: 8588.51365 } } dps_results: { key: "TestElemental-Settings-Orc-P1-EleFireElemental-FullBuffs-LongSingleTarget" value: { - dps: 7153.38176 + dps: 7153.31894 tps: 4122.21165 } } dps_results: { key: "TestElemental-Settings-Orc-P1-EleFireElemental-FullBuffs-ShortSingleTarget" value: { - dps: 8855.35662 + dps: 8855.27756 tps: 4683.59979 } } dps_results: { key: "TestElemental-Settings-Orc-P1-EleFireElemental-NoBuffs-LongMultiTarget" value: { - dps: 6222.66162 + dps: 6222.6063 tps: 2925.15189 } } dps_results: { key: "TestElemental-Settings-Orc-P1-EleFireElemental-NoBuffs-LongSingleTarget" value: { - dps: 3581.34432 + dps: 3581.28887 tps: 1968.54623 } } dps_results: { key: "TestElemental-Settings-Orc-P1-EleFireElemental-NoBuffs-ShortSingleTarget" value: { - dps: 6458.68414 + dps: 6458.61502 tps: 3309.86199 } } @@ -1130,42 +1130,42 @@ dps_results: { dps_results: { key: "TestElemental-Settings-Troll-P1-EleFireElemental-FullBuffs-LongMultiTarget" value: { - dps: 13830.16021 + dps: 13830.10309 tps: 8584.61049 } } dps_results: { key: "TestElemental-Settings-Troll-P1-EleFireElemental-FullBuffs-LongSingleTarget" value: { - dps: 7081.18721 + dps: 7081.13024 tps: 4131.75161 } } dps_results: { key: "TestElemental-Settings-Troll-P1-EleFireElemental-FullBuffs-ShortSingleTarget" value: { - dps: 8611.24841 + dps: 8611.17686 tps: 4629.68545 } } dps_results: { key: "TestElemental-Settings-Troll-P1-EleFireElemental-NoBuffs-LongMultiTarget" value: { - dps: 5916.28149 + dps: 5916.23085 tps: 2912.70974 } } dps_results: { key: "TestElemental-Settings-Troll-P1-EleFireElemental-NoBuffs-LongSingleTarget" value: { - dps: 3510.33353 + dps: 3510.28305 tps: 1964.09774 } } dps_results: { key: "TestElemental-Settings-Troll-P1-EleFireElemental-NoBuffs-ShortSingleTarget" value: { - dps: 6237.19996 + dps: 6237.13633 tps: 3246.08012 } } diff --git a/sim/shaman/enhancement/TestEnhancement.results b/sim/shaman/enhancement/TestEnhancement.results index 97e9827d59..c7e0db27be 100644 --- a/sim/shaman/enhancement/TestEnhancement.results +++ b/sim/shaman/enhancement/TestEnhancement.results @@ -1002,84 +1002,84 @@ dps_results: { dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhFireElemental-FullBuffs-LongMultiTarget" value: { - dps: 21719.68471 + dps: 21719.6215 tps: 12408.13762 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhFireElemental-FullBuffs-LongSingleTarget" value: { - dps: 7735.99363 + dps: 7735.92966 tps: 4120.26715 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhFireElemental-FullBuffs-ShortSingleTarget" value: { - dps: 9453.71834 + dps: 9453.64272 tps: 4476.99794 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhFireElemental-NoBuffs-LongMultiTarget" value: { - dps: 11119.15906 + dps: 11119.09479 tps: 6720.58488 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhFireElemental-NoBuffs-LongSingleTarget" value: { - dps: 4231.84096 + dps: 4231.77652 tps: 2196.44289 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhFireElemental-NoBuffs-ShortSingleTarget" value: { - dps: 5808.51702 + dps: 5808.44976 tps: 2717.55572 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhItemSwap-FullBuffs-LongMultiTarget" value: { - dps: 21364.54218 + dps: 21364.47918 tps: 12395.32962 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhItemSwap-FullBuffs-LongSingleTarget" value: { - dps: 7564.719 + dps: 7564.65583 tps: 4079.07975 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhItemSwap-FullBuffs-ShortSingleTarget" value: { - dps: 9151.63489 + dps: 9151.55751 tps: 4395.58947 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhItemSwap-NoBuffs-LongMultiTarget" value: { - dps: 10694.25616 + dps: 10694.19028 tps: 6606.5281 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhItemSwap-NoBuffs-LongSingleTarget" value: { - dps: 4120.6628 + dps: 4120.59653 tps: 2176.47297 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhItemSwap-NoBuffs-ShortSingleTarget" value: { - dps: 5579.18411 + dps: 5579.11613 tps: 2673.24479 } } @@ -1128,84 +1128,84 @@ dps_results: { dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhFireElemental-FullBuffs-LongMultiTarget" value: { - dps: 21405.98106 + dps: 21405.92482 tps: 12448.78077 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhFireElemental-FullBuffs-LongSingleTarget" value: { - dps: 7668.70236 + dps: 7668.64577 tps: 4155.65471 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhFireElemental-FullBuffs-ShortSingleTarget" value: { - dps: 9313.43701 + dps: 9313.36781 tps: 4551.18634 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhFireElemental-NoBuffs-LongMultiTarget" value: { - dps: 10852.80472 + dps: 10852.74729 tps: 6657.71133 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhFireElemental-NoBuffs-LongSingleTarget" value: { - dps: 4190.15915 + dps: 4190.10294 tps: 2224.78399 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhFireElemental-NoBuffs-ShortSingleTarget" value: { - dps: 5727.09432 + dps: 5727.03535 tps: 2774.14513 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhItemSwap-FullBuffs-LongMultiTarget" value: { - dps: 21016.78241 + dps: 21016.7251 tps: 12358.86801 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhItemSwap-FullBuffs-LongSingleTarget" value: { - dps: 7496.29021 + dps: 7496.23146 tps: 4092.18873 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhItemSwap-FullBuffs-ShortSingleTarget" value: { - dps: 8902.36719 + dps: 8902.2951 tps: 4384.58019 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhItemSwap-NoBuffs-LongMultiTarget" value: { - dps: 10586.27035 + dps: 10586.21304 tps: 6736.75305 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhItemSwap-NoBuffs-LongSingleTarget" value: { - dps: 4026.63236 + dps: 4026.57542 tps: 2162.264 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhItemSwap-NoBuffs-ShortSingleTarget" value: { - dps: 5341.23414 + dps: 5341.17117 tps: 2626.88105 } } From c5c4d5ea7bc14b8372702b8c2658ad632199e24d Mon Sep 17 00:00:00 2001 From: Horatio Date: Thu, 13 Apr 2023 12:37:21 -0300 Subject: [PATCH 5/6] Reverted the orc racials already handled in racials.go --- sim/shaman/elemental/TestElemental.results | 12 +++++----- .../enhancement/TestEnhancement.results | 24 +++++++++---------- sim/shaman/fire_elemental_pet.go | 3 --- 3 files changed, 18 insertions(+), 21 deletions(-) diff --git a/sim/shaman/elemental/TestElemental.results b/sim/shaman/elemental/TestElemental.results index afe792c1e1..388b4ba395 100644 --- a/sim/shaman/elemental/TestElemental.results +++ b/sim/shaman/elemental/TestElemental.results @@ -1046,42 +1046,42 @@ dps_results: { dps_results: { key: "TestElemental-Settings-Orc-P1-EleFireElemental-FullBuffs-LongMultiTarget" value: { - dps: 14173.22856 + dps: 14037.84428 tps: 8588.51365 } } dps_results: { key: "TestElemental-Settings-Orc-P1-EleFireElemental-FullBuffs-LongSingleTarget" value: { - dps: 7153.31894 + dps: 7121.5544 tps: 4122.21165 } } dps_results: { key: "TestElemental-Settings-Orc-P1-EleFireElemental-FullBuffs-ShortSingleTarget" value: { - dps: 8855.27756 + dps: 8783.02416 tps: 4683.59979 } } dps_results: { key: "TestElemental-Settings-Orc-P1-EleFireElemental-NoBuffs-LongMultiTarget" value: { - dps: 6222.6063 + dps: 6112.08498 tps: 2925.15189 } } dps_results: { key: "TestElemental-Settings-Orc-P1-EleFireElemental-NoBuffs-LongSingleTarget" value: { - dps: 3581.28887 + dps: 3555.54301 tps: 1968.54623 } } dps_results: { key: "TestElemental-Settings-Orc-P1-EleFireElemental-NoBuffs-ShortSingleTarget" value: { - dps: 6458.61502 + dps: 6401.14107 tps: 3309.86199 } } diff --git a/sim/shaman/enhancement/TestEnhancement.results b/sim/shaman/enhancement/TestEnhancement.results index c7e0db27be..3aa3c3b19a 100644 --- a/sim/shaman/enhancement/TestEnhancement.results +++ b/sim/shaman/enhancement/TestEnhancement.results @@ -1002,84 +1002,84 @@ dps_results: { dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhFireElemental-FullBuffs-LongMultiTarget" value: { - dps: 21719.6215 + dps: 21589.30194 tps: 12408.13762 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhFireElemental-FullBuffs-LongSingleTarget" value: { - dps: 7735.92966 + dps: 7706.04275 tps: 4120.26715 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhFireElemental-FullBuffs-ShortSingleTarget" value: { - dps: 9453.64272 + dps: 9388.68693 tps: 4476.99794 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhFireElemental-NoBuffs-LongMultiTarget" value: { - dps: 11119.09479 + dps: 11036.38008 tps: 6720.58488 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhFireElemental-NoBuffs-LongSingleTarget" value: { - dps: 4231.77652 + dps: 4210.63415 tps: 2196.44289 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhFireElemental-NoBuffs-ShortSingleTarget" value: { - dps: 5808.44976 + dps: 5762.50794 tps: 2717.55572 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhItemSwap-FullBuffs-LongMultiTarget" value: { - dps: 21364.47918 + dps: 21248.66688 tps: 12395.32962 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhItemSwap-FullBuffs-LongSingleTarget" value: { - dps: 7564.65583 + dps: 7538.89786 tps: 4079.07975 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhItemSwap-FullBuffs-ShortSingleTarget" value: { - dps: 9151.55751 + dps: 9093.76068 tps: 4395.58947 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhItemSwap-NoBuffs-LongMultiTarget" value: { - dps: 10694.19028 + dps: 10625.66038 tps: 6606.5281 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhItemSwap-NoBuffs-LongSingleTarget" value: { - dps: 4120.59653 + dps: 4102.98101 tps: 2176.47297 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhItemSwap-NoBuffs-ShortSingleTarget" value: { - dps: 5579.11613 + dps: 5539.87266 tps: 2673.24479 } } diff --git a/sim/shaman/fire_elemental_pet.go b/sim/shaman/fire_elemental_pet.go index 80fe62c13c..ba55d4bba5 100644 --- a/sim/shaman/fire_elemental_pet.go +++ b/sim/shaman/fire_elemental_pet.go @@ -5,7 +5,6 @@ import ( "time" "github.com/wowsims/wotlk/sim/core" - "github.com/wowsims/wotlk/sim/core/proto" "github.com/wowsims/wotlk/sim/core/stats" ) @@ -53,8 +52,6 @@ func (shaman *Shaman) NewFireElemental() *FireElemental { stats.MeleeHit: -1 * core.MeleeHitRatingPerHitChance, stats.SpellHit: -1 * core.SpellHitRatingPerHitChance, }) - } else if shaman.Race == proto.Race_RaceOrc { - fireElemental.PseudoStats.DamageDealtMultiplier *= 1.05 } shaman.AddPet(fireElemental) From 9515b0a33b423e439b9bfaf9752c5ef83bcd7050 Mon Sep 17 00:00:00 2001 From: Horatio Date: Sun, 18 Jun 2023 18:23:14 -0300 Subject: [PATCH 6/6] Updated test's --- sim/shaman/elemental/TestElemental.results | 24 +++++----- .../enhancement/TestEnhancement.results | 48 +++++++++---------- sim/shaman/fire_elemental_pet.go | 16 ++++--- sim/shaman/shaman.go | 1 + 4 files changed, 47 insertions(+), 42 deletions(-) diff --git a/sim/shaman/elemental/TestElemental.results b/sim/shaman/elemental/TestElemental.results index 3d163c78c3..e7344884f2 100644 --- a/sim/shaman/elemental/TestElemental.results +++ b/sim/shaman/elemental/TestElemental.results @@ -1046,42 +1046,42 @@ dps_results: { dps_results: { key: "TestElemental-Settings-Orc-P1-EleFireElemental-FullBuffs-LongMultiTarget" value: { - dps: 15273.10165 + dps: 15129.33896 tps: 9171.71477 } } dps_results: { key: "TestElemental-Settings-Orc-P1-EleFireElemental-FullBuffs-LongSingleTarget" value: { - dps: 7380.27637 + dps: 7347.59063 tps: 4245.09094 } } dps_results: { key: "TestElemental-Settings-Orc-P1-EleFireElemental-FullBuffs-ShortSingleTarget" value: { - dps: 9025.17225 + dps: 8950.53382 tps: 4778.88447 } } dps_results: { key: "TestElemental-Settings-Orc-P1-EleFireElemental-NoBuffs-LongMultiTarget" value: { - dps: 6924.87755 + dps: 6807.8224 tps: 3387.93706 } } dps_results: { key: "TestElemental-Settings-Orc-P1-EleFireElemental-NoBuffs-LongSingleTarget" value: { - dps: 4031.91121 + dps: 4005.52044 tps: 2250.72174 } } dps_results: { key: "TestElemental-Settings-Orc-P1-EleFireElemental-NoBuffs-ShortSingleTarget" value: { - dps: 6642.00121 + dps: 6582.79903 tps: 3416.27543 } } @@ -1130,42 +1130,42 @@ dps_results: { dps_results: { key: "TestElemental-Settings-Troll-P1-EleFireElemental-FullBuffs-LongMultiTarget" value: { - dps: 14838.54833 + dps: 14704.80039 tps: 8999.86316 } } dps_results: { key: "TestElemental-Settings-Troll-P1-EleFireElemental-FullBuffs-LongSingleTarget" value: { - dps: 7341.02902 + dps: 7310.83985 tps: 4243.26408 } } dps_results: { key: "TestElemental-Settings-Troll-P1-EleFireElemental-FullBuffs-ShortSingleTarget" value: { - dps: 8851.28483 + dps: 8782.01111 tps: 4724.57911 } } dps_results: { key: "TestElemental-Settings-Troll-P1-EleFireElemental-NoBuffs-LongMultiTarget" value: { - dps: 6734.19727 + dps: 6625.43171 tps: 3371.56984 } } dps_results: { key: "TestElemental-Settings-Troll-P1-EleFireElemental-NoBuffs-LongSingleTarget" value: { - dps: 3971.06473 + dps: 3946.74017 tps: 2237.18193 } } dps_results: { key: "TestElemental-Settings-Troll-P1-EleFireElemental-NoBuffs-ShortSingleTarget" value: { - dps: 6453.02718 + dps: 6398.01871 tps: 3344.22541 } } diff --git a/sim/shaman/enhancement/TestEnhancement.results b/sim/shaman/enhancement/TestEnhancement.results index cc064b84d8..2c9f251a52 100644 --- a/sim/shaman/enhancement/TestEnhancement.results +++ b/sim/shaman/enhancement/TestEnhancement.results @@ -1002,84 +1002,84 @@ dps_results: { dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhFireElemental-FullBuffs-LongMultiTarget" value: { - dps: 21830.168 + dps: 21691.69029 tps: 12077.45739 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhFireElemental-FullBuffs-LongSingleTarget" value: { - dps: 7645.19014 + dps: 7614.48913 tps: 4105.32006 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhFireElemental-FullBuffs-ShortSingleTarget" value: { - dps: 9455.7919 + dps: 9388.68693 tps: 4470.62374 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhFireElemental-NoBuffs-LongMultiTarget" value: { - dps: 11984.55155 + dps: 11897.64887 tps: 7238.20997 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhFireElemental-NoBuffs-LongSingleTarget" value: { - dps: 4240.31396 + dps: 4218.82142 tps: 2227.62593 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhFireElemental-NoBuffs-ShortSingleTarget" value: { - dps: 5808.43888 + dps: 5761.21984 tps: 2716.23544 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhItemSwap-FullBuffs-LongMultiTarget" value: { - dps: 21325.26572 + dps: 21202.73907 tps: 11983.50385 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhItemSwap-FullBuffs-LongSingleTarget" value: { - dps: 7501.58397 + dps: 7475.16809 tps: 4079.05395 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhItemSwap-FullBuffs-ShortSingleTarget" value: { - dps: 9153.38453 + dps: 9093.76068 tps: 4390.3509 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhItemSwap-NoBuffs-LongMultiTarget" value: { - dps: 11532.90041 + dps: 11461.30536 tps: 7129.51183 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhItemSwap-NoBuffs-LongSingleTarget" value: { - dps: 4114.27835 + dps: 4096.59617 tps: 2201.12024 } } dps_results: { key: "TestEnhancement-Settings-Orc-P1-EnhItemSwap-NoBuffs-ShortSingleTarget" value: { - dps: 5578.26982 + dps: 5537.95784 tps: 2671.33841 } } @@ -1128,84 +1128,84 @@ dps_results: { dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhFireElemental-FullBuffs-LongMultiTarget" value: { - dps: 21443.06045 + dps: 21317.34725 tps: 12015.86236 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhFireElemental-FullBuffs-LongSingleTarget" value: { - dps: 7617.72156 + dps: 7590.2048 tps: 4146.08764 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhFireElemental-FullBuffs-ShortSingleTarget" value: { - dps: 9373.9797 + dps: 9313.36781 tps: 4545.22588 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhFireElemental-NoBuffs-LongMultiTarget" value: { - dps: 11753.70558 + dps: 11675.2001 tps: 7190.74357 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhFireElemental-NoBuffs-LongSingleTarget" value: { - dps: 4169.71469 + dps: 4150.72648 tps: 2220.94529 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhFireElemental-NoBuffs-ShortSingleTarget" value: { - dps: 5774.55866 + dps: 5732.73753 tps: 2781.72271 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhItemSwap-FullBuffs-LongMultiTarget" value: { - dps: 21011.19933 + dps: 20900.34366 tps: 11924.31454 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhItemSwap-FullBuffs-LongSingleTarget" value: { - dps: 7458.79421 + dps: 7435.0347 tps: 4094.33538 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhItemSwap-FullBuffs-ShortSingleTarget" value: { - dps: 8955.52501 + dps: 8902.2951 tps: 4378.13273 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhItemSwap-NoBuffs-LongMultiTarget" value: { - dps: 11298.48918 + dps: 11233.975 tps: 7046.81856 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhItemSwap-NoBuffs-LongSingleTarget" value: { - dps: 4085.4434 + dps: 4069.6511 tps: 2216.83085 } } dps_results: { key: "TestEnhancement-Settings-Troll-P1-EnhItemSwap-NoBuffs-ShortSingleTarget" value: { - dps: 5399.00434 + dps: 5363.01527 tps: 2634.31029 } } diff --git a/sim/shaman/fire_elemental_pet.go b/sim/shaman/fire_elemental_pet.go index cbbe75b801..0343e35d1a 100644 --- a/sim/shaman/fire_elemental_pet.go +++ b/sim/shaman/fire_elemental_pet.go @@ -5,6 +5,7 @@ import ( "time" "github.com/wowsims/wotlk/sim/core" + "github.com/wowsims/wotlk/sim/core/proto" "github.com/wowsims/wotlk/sim/core/stats" ) @@ -50,16 +51,17 @@ func (shaman *Shaman) NewFireElemental(bonusSpellPower float64) *FireElemental { fireElemental.AddStat(stats.AttackPower, float64(bonusSpellPower)*4.45) } - fireElemental.OnPetEnable = fireElemental.enable - fireElemental.OnPetDisable = fireElemental.disable - - if shaman.hasHeroicPresence { + if shaman.hasHeroicPresence || shaman.Race == proto.Race_RaceDraenei { fireElemental.AddStats(stats.Stats{ - stats.MeleeHit: -1 * core.MeleeHitRatingPerHitChance, - stats.SpellHit: -1 * core.SpellHitRatingPerHitChance, + stats.MeleeHit: -core.MeleeHitRatingPerHitChance, + stats.SpellHit: -core.SpellHitRatingPerHitChance, + stats.Expertise: math.Floor(-core.SpellHitRatingPerHitChance * 0.79), }) } + fireElemental.OnPetEnable = fireElemental.enable + fireElemental.OnPetDisable = fireElemental.disable + shaman.AddPet(fireElemental) return fireElemental @@ -78,12 +80,14 @@ func (fireElemental *FireElemental) GetPet() *core.Pet { } func (fireElemental *FireElemental) Initialize() { + fireElemental.registerFireBlast() fireElemental.registerFireNova() fireElemental.registerFireShieldAura() } func (fireElemental *FireElemental) Reset(sim *core.Simulation) { + } func (fireElemental *FireElemental) OnGCDReady(sim *core.Simulation) { diff --git a/sim/shaman/shaman.go b/sim/shaman/shaman.go index d3f526b239..b08fa0d7a9 100644 --- a/sim/shaman/shaman.go +++ b/sim/shaman/shaman.go @@ -222,6 +222,7 @@ func (shaman *Shaman) AddPartyBuffs(partyBuffs *proto.PartyBuffs) { if shaman.Talents.ManaTideTotem { partyBuffs.ManaTideTotems++ } + shaman.hasHeroicPresence = partyBuffs.HeroicPresence }