From 9515b0a33b423e439b9bfaf9752c5ef83bcd7050 Mon Sep 17 00:00:00 2001 From: Horatio Date: Sun, 18 Jun 2023 18:23:14 -0300 Subject: [PATCH] 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 }