diff --git a/sim/common/cata/damage_procs.go b/sim/common/cata/damage_procs.go index 1127d8ce38..53871721d6 100644 --- a/sim/common/cata/damage_procs.go +++ b/sim/common/cata/damage_procs.go @@ -44,7 +44,9 @@ func init() { core.NewItemEffect(68925, func(agent core.Agent) { character := agent.GetCharacter() - procChance := 0.15 //TODO: simc proc chance, verify when available + // Proc chance determined to be p=.48 by video research - Researched by InDebt & Frostbitten + // Research: https://github.com/wowsims/cata/pull/1009#issuecomment-2348700653 + procChance := 0.5 dummyAura := character.GetOrRegisterAura(core.Aura{ Label: "Electrical Charge", ActionID: core.ActionID{SpellID: 96890}, @@ -89,7 +91,9 @@ func init() { core.NewItemEffect(69110, func(agent core.Agent) { character := agent.GetCharacter() - procChance := 0.15 //TODO: simc proc chance, verify when available + // Proc chance determined to be p=.48 by video research - Researched by InDebt & Frostbitten + // Research: https://github.com/wowsims/cata/pull/1009#issuecomment-2348700653 + procChance := 0.5 dummyAura := character.GetOrRegisterAura(core.Aura{ Label: "Electrical Charge", ActionID: core.ActionID{SpellID: 96890}, diff --git a/sim/death_knight/blood/TestBlood.results b/sim/death_knight/blood/TestBlood.results index 4c52f9bd20..e0078f66fb 100644 --- a/sim/death_knight/blood/TestBlood.results +++ b/sim/death_knight/blood/TestBlood.results @@ -1454,16 +1454,16 @@ dps_results: { dps_results: { key: "TestBlood-AllItems-VariablePulseLightningCapacitor-68925" value: { - dps: 13867.989 - tps: 67355.20233 + dps: 13894.55341 + tps: 67491.94038 hps: 3597.80333 } } dps_results: { key: "TestBlood-AllItems-VariablePulseLightningCapacitor-69110" value: { - dps: 13994.66585 - tps: 68006.57714 + dps: 14072.10466 + tps: 68453.99466 hps: 3597.80333 } } diff --git a/sim/death_knight/frost/TestFrost.results b/sim/death_knight/frost/TestFrost.results index ac59202e87..9587321225 100644 --- a/sim/death_knight/frost/TestFrost.results +++ b/sim/death_knight/frost/TestFrost.results @@ -1454,17 +1454,17 @@ dps_results: { dps_results: { key: "TestFrost-AllItems-VariablePulseLightningCapacitor-68925" value: { - dps: 20888.44098 - tps: 19046.66966 - hps: 243.15661 + dps: 20923.14355 + tps: 19076.10728 + hps: 245.25883 } } dps_results: { key: "TestFrost-AllItems-VariablePulseLightningCapacitor-69110" value: { - dps: 21169.41677 - tps: 19320.66477 - hps: 244.55809 + dps: 21205.37782 + tps: 19356.3376 + hps: 243.85735 } } dps_results: { diff --git a/sim/death_knight/unholy/TestUnholy.results b/sim/death_knight/unholy/TestUnholy.results index 8243e304a2..bcb2bebe4a 100644 --- a/sim/death_knight/unholy/TestUnholy.results +++ b/sim/death_knight/unholy/TestUnholy.results @@ -1453,16 +1453,16 @@ dps_results: { dps_results: { key: "TestUnholy-AllItems-VariablePulseLightningCapacitor-68925" value: { - dps: 30689.34267 - tps: 22722.60867 + dps: 30717.84199 + tps: 22775.15024 hps: 546.10701 } } dps_results: { key: "TestUnholy-AllItems-VariablePulseLightningCapacitor-69110" value: { - dps: 30903.73701 - tps: 22921.83641 + dps: 31040.44147 + tps: 23096.88086 hps: 546.10701 } } diff --git a/sim/druid/feral/TestFeral.results b/sim/druid/feral/TestFeral.results index a2364d7d55..922e6608d4 100644 --- a/sim/druid/feral/TestFeral.results +++ b/sim/druid/feral/TestFeral.results @@ -1292,15 +1292,15 @@ dps_results: { dps_results: { key: "TestFeral-AllItems-VariablePulseLightningCapacitor-68925" value: { - dps: 25440.2205 - tps: 36365.45089 + dps: 25442.44906 + tps: 36368.2953 } } dps_results: { key: "TestFeral-AllItems-VariablePulseLightningCapacitor-69110" value: { - dps: 25442.14595 - tps: 36370.85154 + dps: 25445.65054 + tps: 36384.22947 } } dps_results: { @@ -1457,258 +1457,6 @@ dps_results: { tps: 38099.78544 } } -dps_results: { - key: "TestFeral-Settings-Tauren-p1-DefaultTalents-ExternalBleed-aoe-FullBuffs-25.0yards-LongMultiTarget" - value: { - dps: 72482.79527 - tps: 102452.5317 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-p1-DefaultTalents-ExternalBleed-aoe-FullBuffs-25.0yards-LongSingleTarget" - value: { - dps: 17314.8806 - tps: 30603.86836 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-p1-DefaultTalents-ExternalBleed-aoe-FullBuffs-25.0yards-ShortSingleTarget" - value: { - dps: 20168.86034 - tps: 27210.30277 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-p1-DefaultTalents-ExternalBleed-aoe-NoBuffs-25.0yards-LongMultiTarget" - value: { - dps: 48860.03087 - tps: 71806.94005 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-p1-DefaultTalents-ExternalBleed-aoe-NoBuffs-25.0yards-LongSingleTarget" - value: { - dps: 10501.0355 - tps: 19012.23496 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-p1-DefaultTalents-ExternalBleed-aoe-NoBuffs-25.0yards-ShortSingleTarget" - value: { - dps: 10595.61334 - tps: 18566.7369 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-p1-DefaultTalents-ExternalBleed-default-FullBuffs-25.0yards-LongMultiTarget" - value: { - dps: 34147.15539 - tps: 51467.00617 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-p1-DefaultTalents-ExternalBleed-default-FullBuffs-25.0yards-LongSingleTarget" - value: { - dps: 30596.73369 - tps: 42742.1699 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-p1-DefaultTalents-ExternalBleed-default-FullBuffs-25.0yards-ShortSingleTarget" - value: { - dps: 37555.94487 - tps: 38887.67166 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-p1-DefaultTalents-ExternalBleed-default-NoBuffs-25.0yards-LongMultiTarget" - value: { - dps: 21423.66892 - tps: 33129.29656 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-p1-DefaultTalents-ExternalBleed-default-NoBuffs-25.0yards-LongSingleTarget" - value: { - dps: 19508.92026 - tps: 28537.42221 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-p1-DefaultTalents-ExternalBleed-default-NoBuffs-25.0yards-ShortSingleTarget" - value: { - dps: 20822.92874 - tps: 23263.7434 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-p1-DefaultTalents-ExternalBleed-monocat-FullBuffs-25.0yards-LongMultiTarget" - value: { - dps: 30294.38525 - tps: 21511.27417 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-p1-DefaultTalents-ExternalBleed-monocat-FullBuffs-25.0yards-LongSingleTarget" - value: { - dps: 29699.93003 - tps: 21086.95032 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-p1-DefaultTalents-ExternalBleed-monocat-FullBuffs-25.0yards-ShortSingleTarget" - value: { - dps: 36710.76641 - tps: 26064.64415 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-p1-DefaultTalents-ExternalBleed-monocat-NoBuffs-25.0yards-LongMultiTarget" - value: { - dps: 18558.3292 - tps: 13178.77661 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-p1-DefaultTalents-ExternalBleed-monocat-NoBuffs-25.0yards-LongSingleTarget" - value: { - dps: 18714.01678 - tps: 13287.16207 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-p1-DefaultTalents-ExternalBleed-monocat-NoBuffs-25.0yards-ShortSingleTarget" - value: { - dps: 20431.50102 - tps: 14506.93372 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-p1-HybridTalents-ExternalBleed-aoe-FullBuffs-25.0yards-LongMultiTarget" - value: { - dps: 72438.94596 - tps: 102036.95006 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-p1-HybridTalents-ExternalBleed-aoe-FullBuffs-25.0yards-LongSingleTarget" - value: { - dps: 17176.04684 - tps: 30277.02948 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-p1-HybridTalents-ExternalBleed-aoe-FullBuffs-25.0yards-ShortSingleTarget" - value: { - dps: 19996.9155 - tps: 26249.58074 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-p1-HybridTalents-ExternalBleed-aoe-NoBuffs-25.0yards-LongMultiTarget" - value: { - dps: 48802.94006 - tps: 70998.87144 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-p1-HybridTalents-ExternalBleed-aoe-NoBuffs-25.0yards-LongSingleTarget" - value: { - dps: 10484.79216 - tps: 19203.81306 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-p1-HybridTalents-ExternalBleed-aoe-NoBuffs-25.0yards-ShortSingleTarget" - value: { - dps: 10478.07646 - tps: 19082.02287 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-p1-HybridTalents-ExternalBleed-default-FullBuffs-25.0yards-LongMultiTarget" - value: { - dps: 33209.34787 - tps: 49380.19404 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-p1-HybridTalents-ExternalBleed-default-FullBuffs-25.0yards-LongSingleTarget" - value: { - dps: 29663.76428 - tps: 40864.36479 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-p1-HybridTalents-ExternalBleed-default-FullBuffs-25.0yards-ShortSingleTarget" - value: { - dps: 36353.12147 - tps: 35915.94927 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-p1-HybridTalents-ExternalBleed-default-NoBuffs-25.0yards-LongMultiTarget" - value: { - dps: 20973.38885 - tps: 32671.99402 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-p1-HybridTalents-ExternalBleed-default-NoBuffs-25.0yards-LongSingleTarget" - value: { - dps: 18937.84517 - tps: 27531.40002 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-p1-HybridTalents-ExternalBleed-default-NoBuffs-25.0yards-ShortSingleTarget" - value: { - dps: 20127.66711 - tps: 21995.38784 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-p1-HybridTalents-ExternalBleed-monocat-FullBuffs-25.0yards-LongMultiTarget" - value: { - dps: 29730.60375 - tps: 21110.98931 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-p1-HybridTalents-ExternalBleed-monocat-FullBuffs-25.0yards-LongSingleTarget" - value: { - dps: 28838.33016 - tps: 20475.21442 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-p1-HybridTalents-ExternalBleed-monocat-FullBuffs-25.0yards-ShortSingleTarget" - value: { - dps: 35991.27017 - tps: 25553.80182 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-p1-HybridTalents-ExternalBleed-monocat-NoBuffs-25.0yards-LongMultiTarget" - value: { - dps: 18034.50985 - tps: 12806.86487 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-p1-HybridTalents-ExternalBleed-monocat-NoBuffs-25.0yards-LongSingleTarget" - value: { - dps: 18131.26428 - tps: 12873.4078 - } -} -dps_results: { - key: "TestFeral-Settings-Tauren-p1-HybridTalents-ExternalBleed-monocat-NoBuffs-25.0yards-ShortSingleTarget" - value: { - dps: 19777.98396 - tps: 14042.93661 - } -} dps_results: { key: "TestFeral-Settings-Tauren-p3-DefaultTalents-ExternalBleed-aoe-FullBuffs-25.0yards-LongMultiTarget" value: { diff --git a/sim/druid/feral/rotation.go b/sim/druid/feral/rotation.go index e140373b51..e4fb49f97b 100644 --- a/sim/druid/feral/rotation.go +++ b/sim/druid/feral/rotation.go @@ -330,21 +330,21 @@ func (cat *FeralDruid) calcBleedRefreshTime(sim *core.Simulation, bleedSpell *dr maxTickCount := core.TernaryInt32(isRip, cat.maxRipTicks, bleedDot.BaseTickCount) maxBleedDur := bleedDot.BaseTickLength * time.Duration(maxTickCount) numCastsCovered := buffRemains / maxBleedDur - buffEnd := cat.tempSnapshotAura.ExpiresAt() - numCastsCovered * maxBleedDur + buffEnd := cat.tempSnapshotAura.ExpiresAt() - numCastsCovered*maxBleedDur - if buffEnd > standardRefreshTime + cat.ReactionTime { + if buffEnd > standardRefreshTime+cat.ReactionTime { return standardRefreshTime } // Potential clips for a buff snapshot should be done as late as possible - latestPossibleSnapshot := buffEnd - cat.ReactionTime * time.Duration(2) + latestPossibleSnapshot := buffEnd - cat.ReactionTime*time.Duration(2) numClippedTicks := (bleedEnd - latestPossibleSnapshot) / bleedDot.BaseTickLength - targetClipTime := standardRefreshTime - numClippedTicks * bleedDot.BaseTickLength + targetClipTime := standardRefreshTime - numClippedTicks*bleedDot.BaseTickLength // Since the clip can cost us 30-35 Energy, we need to determine whether the damage gain is worth the // spend. First calculate the maximum number of buffed bleed ticks we can get out before the fight // ends. - buffedTickCount := min(maxTickCount, int32((sim.Duration - targetClipTime) / bleedDot.BaseTickLength)) + buffedTickCount := min(maxTickCount, int32((sim.Duration-targetClipTime)/bleedDot.BaseTickLength)) // Perform a DPE comparison vs. Shred expectedDamageGain := (bleedSpell.NewSnapshotPower - bleedSpell.CurrentSnapshotPower) * float64(buffedTickCount) diff --git a/sim/druid/guardian/TestGuardian.results b/sim/druid/guardian/TestGuardian.results index 08ab3bdfb6..0b3d097e43 100644 --- a/sim/druid/guardian/TestGuardian.results +++ b/sim/druid/guardian/TestGuardian.results @@ -1292,15 +1292,15 @@ dps_results: { dps_results: { key: "TestGuardian-AllItems-VariablePulseLightningCapacitor-68925" value: { - dps: 7733.56645 - tps: 38730.31535 + dps: 7749.82629 + tps: 38811.60458 } } dps_results: { key: "TestGuardian-AllItems-VariablePulseLightningCapacitor-69110" value: { - dps: 7836.8759 - tps: 39246.48344 + dps: 7872.79413 + tps: 39426.33296 } } dps_results: { diff --git a/sim/hunter/beast_mastery/TestBM.results b/sim/hunter/beast_mastery/TestBM.results index d5a7cbfde4..bc2c3cb282 100644 --- a/sim/hunter/beast_mastery/TestBM.results +++ b/sim/hunter/beast_mastery/TestBM.results @@ -1313,15 +1313,15 @@ dps_results: { dps_results: { key: "TestBM-AllItems-VariablePulseLightningCapacitor-68925" value: { - dps: 20968.80574 - tps: 17718.82319 + dps: 21012.01838 + tps: 17762.28417 } } dps_results: { key: "TestBM-AllItems-VariablePulseLightningCapacitor-69110" value: { - dps: 21166.8332 - tps: 17916.76344 + dps: 21250.388 + tps: 18000.45117 } } dps_results: { diff --git a/sim/hunter/marksmanship/TestMM.results b/sim/hunter/marksmanship/TestMM.results index 3188a70460..7b1199567a 100644 --- a/sim/hunter/marksmanship/TestMM.results +++ b/sim/hunter/marksmanship/TestMM.results @@ -1313,15 +1313,15 @@ dps_results: { dps_results: { key: "TestMM-AllItems-VariablePulseLightningCapacitor-68925" value: { - dps: 20878.62799 - tps: 18705.32714 + dps: 20916.09315 + tps: 18742.56027 } } dps_results: { key: "TestMM-AllItems-VariablePulseLightningCapacitor-69110" value: { - dps: 21048.40117 - tps: 18874.99622 + dps: 21128.00061 + tps: 18954.65458 } } dps_results: { diff --git a/sim/hunter/survival/TestSV.results b/sim/hunter/survival/TestSV.results index d101ea20d5..627d2cb936 100644 --- a/sim/hunter/survival/TestSV.results +++ b/sim/hunter/survival/TestSV.results @@ -1313,15 +1313,15 @@ dps_results: { dps_results: { key: "TestSV-AllItems-VariablePulseLightningCapacitor-68925" value: { - dps: 24665.32864 - tps: 22301.67209 + dps: 24717.98168 + tps: 22354.32052 } } dps_results: { key: "TestSV-AllItems-VariablePulseLightningCapacitor-69110" value: { - dps: 25051.9613 - tps: 22688.42367 + dps: 25189.74485 + tps: 22826.0256 } } dps_results: { diff --git a/sim/mage/arcane/TestArcane.results b/sim/mage/arcane/TestArcane.results index 7afe2d024e..e3f4138390 100644 --- a/sim/mage/arcane/TestArcane.results +++ b/sim/mage/arcane/TestArcane.results @@ -1264,15 +1264,15 @@ dps_results: { dps_results: { key: "TestArcane-AllItems-VariablePulseLightningCapacitor-68925" value: { - dps: 29251.62308 - tps: 29433.74735 + dps: 29130.74985 + tps: 29310.71037 } } dps_results: { key: "TestArcane-AllItems-VariablePulseLightningCapacitor-69110" value: { - dps: 29975.37267 - tps: 30159.46652 + dps: 30077.99079 + tps: 30251.69274 } } dps_results: { diff --git a/sim/mage/fire/TestFire.results b/sim/mage/fire/TestFire.results index 0a33f758c8..20a6bfc2e6 100644 --- a/sim/mage/fire/TestFire.results +++ b/sim/mage/fire/TestFire.results @@ -1264,15 +1264,15 @@ dps_results: { dps_results: { key: "TestFire-AllItems-VariablePulseLightningCapacitor-68925" value: { - dps: 29694.6826 - tps: 29169.46099 + dps: 29689.89951 + tps: 29181.93389 } } dps_results: { key: "TestFire-AllItems-VariablePulseLightningCapacitor-69110" value: { - dps: 30662.09682 - tps: 30137.02353 + dps: 30932.74388 + tps: 30415.36489 } } dps_results: { diff --git a/sim/paladin/retribution/TestRetribution.results b/sim/paladin/retribution/TestRetribution.results index 3fcf3f6c7d..ed09b3d4ba 100644 --- a/sim/paladin/retribution/TestRetribution.results +++ b/sim/paladin/retribution/TestRetribution.results @@ -1292,15 +1292,15 @@ dps_results: { dps_results: { key: "TestRetribution-AllItems-VariablePulseLightningCapacitor-68925" value: { - dps: 29884.78547 - tps: 29894.52531 + dps: 29916.61356 + tps: 29926.35339 } } dps_results: { key: "TestRetribution-AllItems-VariablePulseLightningCapacitor-69110" value: { - dps: 30119.73666 - tps: 30132.39482 + dps: 30229.37873 + tps: 30242.0369 } } dps_results: { diff --git a/sim/priest/shadow/TestShadow.results b/sim/priest/shadow/TestShadow.results index ec9983daf7..ae15c57387 100644 --- a/sim/priest/shadow/TestShadow.results +++ b/sim/priest/shadow/TestShadow.results @@ -1299,15 +1299,15 @@ dps_results: { dps_results: { key: "TestShadow-AllItems-VariablePulseLightningCapacitor-68925" value: { - dps: 29374.08565 - tps: 27316.2537 + dps: 29457.29847 + tps: 27397.32327 } } dps_results: { key: "TestShadow-AllItems-VariablePulseLightningCapacitor-69110" value: { - dps: 30091.65924 - tps: 28011.50944 + dps: 30387.4878 + tps: 28297.58729 } } dps_results: { diff --git a/sim/rogue/assassination/TestAssassination.results b/sim/rogue/assassination/TestAssassination.results index cf57c9531f..b5f7d973eb 100644 --- a/sim/rogue/assassination/TestAssassination.results +++ b/sim/rogue/assassination/TestAssassination.results @@ -1287,15 +1287,15 @@ dps_results: { dps_results: { key: "TestAssassination-AllItems-VariablePulseLightningCapacitor-68925" value: { - dps: 27444.08992 - tps: 19485.30384 + dps: 27417.79062 + tps: 19466.63134 } } dps_results: { key: "TestAssassination-AllItems-VariablePulseLightningCapacitor-69110" value: { - dps: 27529.18263 - tps: 19545.71966 + dps: 27507.75473 + tps: 19530.50586 } } dps_results: { diff --git a/sim/shaman/elemental/TestElemental.results b/sim/shaman/elemental/TestElemental.results index 800eeff933..3e3781af91 100644 --- a/sim/shaman/elemental/TestElemental.results +++ b/sim/shaman/elemental/TestElemental.results @@ -1313,15 +1313,15 @@ dps_results: { dps_results: { key: "TestElemental-AllItems-VariablePulseLightningCapacitor-68925" value: { - dps: 31939.1747 - tps: 932.33833 + dps: 32028.6894 + tps: 1001.35867 } } dps_results: { key: "TestElemental-AllItems-VariablePulseLightningCapacitor-69110" value: { - dps: 32743.07347 - tps: 1543.69563 + dps: 32930.54117 + tps: 1767.73688 } } dps_results: { diff --git a/sim/shaman/enhancement/TestEnhancement.results b/sim/shaman/enhancement/TestEnhancement.results index 2712cbc555..02d6d5f887 100644 --- a/sim/shaman/enhancement/TestEnhancement.results +++ b/sim/shaman/enhancement/TestEnhancement.results @@ -1313,15 +1313,15 @@ dps_results: { dps_results: { key: "TestEnhancement-AllItems-VariablePulseLightningCapacitor-68925" value: { - dps: 28118.0477 - tps: 18783.62043 + dps: 28124.51387 + tps: 18870.43779 } } dps_results: { key: "TestEnhancement-AllItems-VariablePulseLightningCapacitor-69110" value: { - dps: 28722.35965 - tps: 19339.80417 + dps: 28925.57798 + tps: 19561.76086 } } dps_results: { diff --git a/sim/warlock/affliction/TestAffliction.results b/sim/warlock/affliction/TestAffliction.results index e9e0c03d7c..b69c533118 100644 --- a/sim/warlock/affliction/TestAffliction.results +++ b/sim/warlock/affliction/TestAffliction.results @@ -1257,15 +1257,15 @@ dps_results: { dps_results: { key: "TestAffliction-AllItems-VariablePulseLightningCapacitor-68925" value: { - dps: 28100.8619 - tps: 20602.84337 + dps: 28224.11236 + tps: 20616.2025 } } dps_results: { key: "TestAffliction-AllItems-VariablePulseLightningCapacitor-69110" value: { - dps: 28810.4722 - tps: 21267.3472 + dps: 28955.09941 + tps: 21363.131 } } dps_results: { diff --git a/sim/warlock/demonology/TestDemonology.results b/sim/warlock/demonology/TestDemonology.results index a835153a8f..3e93d2e432 100644 --- a/sim/warlock/demonology/TestDemonology.results +++ b/sim/warlock/demonology/TestDemonology.results @@ -1257,15 +1257,15 @@ dps_results: { dps_results: { key: "TestDemonology-AllItems-VariablePulseLightningCapacitor-68925" value: { - dps: 29443.08554 - tps: 15131.80468 + dps: 29513.96717 + tps: 15236.93695 } } dps_results: { key: "TestDemonology-AllItems-VariablePulseLightningCapacitor-69110" value: { - dps: 30198.92083 - tps: 15904.05334 + dps: 30433.64871 + tps: 15953.81254 } } dps_results: { diff --git a/sim/warlock/destruction/TestDestruction.results b/sim/warlock/destruction/TestDestruction.results index ba316fd839..bc6fc6ce79 100644 --- a/sim/warlock/destruction/TestDestruction.results +++ b/sim/warlock/destruction/TestDestruction.results @@ -1257,15 +1257,15 @@ dps_results: { dps_results: { key: "TestDestruction-AllItems-VariablePulseLightningCapacitor-68925" value: { - dps: 28897.58861 - tps: 18862.92196 + dps: 29014.1718 + tps: 18960.26042 } } dps_results: { key: "TestDestruction-AllItems-VariablePulseLightningCapacitor-69110" value: { - dps: 29548.03556 - tps: 19454.31709 + dps: 29730.91062 + tps: 19565.41333 } } dps_results: { diff --git a/ui/core/constants/item_notices.tsx b/ui/core/constants/item_notices.tsx index 1ed108177d..81c6172899 100644 --- a/ui/core/constants/item_notices.tsx +++ b/ui/core/constants/item_notices.tsx @@ -1,7 +1,7 @@ import { ItemNoticeData, SetBonusNoticeData } from '../components/item_notice/item_notice'; import { Spec } from '../proto/common'; -const DTR_MISSING_IMPLEMENTATION_WARNING = ( +const MISSING_IMPLEMENTATION_WARNING = ( <>

This item is not implemented!

We are working hard on gathering all the old resources to allow for an initial implementation.

@@ -9,65 +9,89 @@ const DTR_MISSING_IMPLEMENTATION_WARNING = ( ); +const PROC_IMPLEMENTATION_WARNING = ( + <> +

The proc rate for this item might not be correct!

+

Current proc rate is 50%, based on old video data.

+

Want to help out by providing additional information? Contact us on our Discord!

+ +); + export const ITEM_NOTICES = new Map([ // Dragonwrath, Tarecgosa's Rest [ 71086, { - [Spec.SpecUnknown]: DTR_MISSING_IMPLEMENTATION_WARNING, - [Spec.SpecBalanceDruid]: DTR_MISSING_IMPLEMENTATION_WARNING, - [Spec.SpecArcaneMage]: DTR_MISSING_IMPLEMENTATION_WARNING, - [Spec.SpecFireMage]: DTR_MISSING_IMPLEMENTATION_WARNING, - [Spec.SpecFrostMage]: DTR_MISSING_IMPLEMENTATION_WARNING, - [Spec.SpecShadowPriest]: DTR_MISSING_IMPLEMENTATION_WARNING, - [Spec.SpecElementalShaman]: DTR_MISSING_IMPLEMENTATION_WARNING, - [Spec.SpecAfflictionWarlock]: DTR_MISSING_IMPLEMENTATION_WARNING, - [Spec.SpecDemonologyWarlock]: DTR_MISSING_IMPLEMENTATION_WARNING, - [Spec.SpecDestructionWarlock]: DTR_MISSING_IMPLEMENTATION_WARNING, + [Spec.SpecUnknown]: MISSING_IMPLEMENTATION_WARNING, + [Spec.SpecBalanceDruid]: MISSING_IMPLEMENTATION_WARNING, + [Spec.SpecArcaneMage]: MISSING_IMPLEMENTATION_WARNING, + [Spec.SpecFireMage]: MISSING_IMPLEMENTATION_WARNING, + [Spec.SpecFrostMage]: MISSING_IMPLEMENTATION_WARNING, + [Spec.SpecShadowPriest]: MISSING_IMPLEMENTATION_WARNING, + [Spec.SpecElementalShaman]: MISSING_IMPLEMENTATION_WARNING, + [Spec.SpecAfflictionWarlock]: MISSING_IMPLEMENTATION_WARNING, + [Spec.SpecDemonologyWarlock]: MISSING_IMPLEMENTATION_WARNING, + [Spec.SpecDestructionWarlock]: MISSING_IMPLEMENTATION_WARNING, }, ], // Rogue Legendary Daggers (All Stages) - [ // Fear + [ + // Fear 77945, { - [Spec.SpecUnknown]: DTR_MISSING_IMPLEMENTATION_WARNING + [Spec.SpecUnknown]: MISSING_IMPLEMENTATION_WARNING, }, ], - [ // Vengeance + [ + // Vengeance 77946, { - [Spec.SpecUnknown]: DTR_MISSING_IMPLEMENTATION_WARNING + [Spec.SpecUnknown]: MISSING_IMPLEMENTATION_WARNING, }, ], - [ // Sleeper + [ + // Sleeper 77947, { - [Spec.SpecUnknown]: DTR_MISSING_IMPLEMENTATION_WARNING + [Spec.SpecUnknown]: MISSING_IMPLEMENTATION_WARNING, }, ], - [ // Dreamer + [ + // Dreamer 77948, { - [Spec.SpecUnknown]: DTR_MISSING_IMPLEMENTATION_WARNING + [Spec.SpecUnknown]: MISSING_IMPLEMENTATION_WARNING, }, ], - [ // Golad + [ + // Golad 77949, { - [Spec.SpecUnknown]: DTR_MISSING_IMPLEMENTATION_WARNING + [Spec.SpecUnknown]: MISSING_IMPLEMENTATION_WARNING, }, ], - [ // Tiriosh + [ + // Tiriosh 77950, { - [Spec.SpecUnknown]: DTR_MISSING_IMPLEMENTATION_WARNING + [Spec.SpecUnknown]: MISSING_IMPLEMENTATION_WARNING, }, ], + [ + // VPLC - Normal + 68925, + { [Spec.SpecUnknown]: PROC_IMPLEMENTATION_WARNING }, + ], + [ + // VPLC - Heroic + 69110, + { [Spec.SpecUnknown]: PROC_IMPLEMENTATION_WARNING }, + ], ]); export const GENERIC_MISSING_SET_BONUS_NOTICE_DATA = new Map([ - [2, "Not yet implemented"], - [4, "Not yet implemented"], + [2, 'Not yet implemented'], + [4, 'Not yet implemented'], ]); export const SET_BONUS_NOTICES = new Map([ @@ -75,15 +99,15 @@ export const SET_BONUS_NOTICES = new Map([ [ 1002, // Feral T12 new Map([ - [2, "Not implemented, requires PTR testing!"], - [4, "Implemented and working for both cat and bear"], + [2, 'Not implemented, requires PTR testing!'], + [4, 'Implemented and working for both cat and bear'], ]), ], [ 1008, // Warlock T12 new Map([ - [2, "Requires PTR testing to confirm exact pet behaviour & stats"], - [4, "Exact proc behaviour may vary, needs PTR testing to confirm"], + [2, 'Requires PTR testing to confirm exact pet behaviour & stats'], + [4, 'Exact proc behaviour may vary, needs PTR testing to confirm'], ]), ],