From 0ab4c3c3d8c0d5fd6e6c3cc58f6a079c52171c63 Mon Sep 17 00:00:00 2001 From: Sinark Date: Thu, 4 Jan 2024 10:30:49 -0500 Subject: [PATCH 1/2] fix check of meta socket gems (#4123) Co-authored-by: Owen McCabe --- sim/core/database.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sim/core/database.go b/sim/core/database.go index 303e76aa2e..02deb8e248 100644 --- a/sim/core/database.go +++ b/sim/core/database.go @@ -396,7 +396,7 @@ func ColorIntersects(g proto.GemColor, o proto.GemColor) bool { return true } if g == proto.GemColor_GemColorMeta { - return o == proto.GemColor_GemColorUnknown + return o == proto.GemColor_GemColorMeta } if g == proto.GemColor_GemColorRed { return o == proto.GemColor_GemColorOrange || o == proto.GemColor_GemColorPurple From 348ffcd0bdc359f4fbd3b5fe4d1d71e663dcdcb0 Mon Sep 17 00:00:00 2001 From: James Tanner Date: Thu, 4 Jan 2024 19:41:18 -0800 Subject: [PATCH 2/2] Fix feral tests to always use a rotation --- sim/druid/feral/TestFeral.results | 632 +++++++++++++++--------------- sim/druid/feral/feral_test.go | 24 +- 2 files changed, 317 insertions(+), 339 deletions(-) diff --git a/sim/druid/feral/TestFeral.results b/sim/druid/feral/TestFeral.results index fe3b3ab5d4..e81669af29 100644 --- a/sim/druid/feral/TestFeral.results +++ b/sim/druid/feral/TestFeral.results @@ -46,1047 +46,1047 @@ character_stats_results: { dps_results: { key: "TestFeral-AllItems-Althor'sAbacus-50359" value: { - dps: 7440.535 - tps: 5345.52586 + dps: 7428.7408 + tps: 5337.15198 } } dps_results: { key: "TestFeral-AllItems-Althor'sAbacus-50366" value: { - dps: 7440.535 - tps: 5345.52586 + dps: 7428.7408 + tps: 5337.15198 } } dps_results: { key: "TestFeral-AllItems-AshtongueTalismanofEquilibrium-32486" value: { - dps: 7440.535 - tps: 5345.52586 + dps: 7428.7408 + tps: 5337.15198 } } dps_results: { key: "TestFeral-AllItems-AustereEarthsiegeDiamond" value: { - dps: 7540.79956 - tps: 5418.88251 + dps: 7536.62918 + tps: 5416.29548 } } dps_results: { key: "TestFeral-AllItems-Bandit'sInsignia-40371" value: { - dps: 7598.68797 - tps: 5458.18841 + dps: 7589.33651 + tps: 5450.87579 } } dps_results: { key: "TestFeral-AllItems-BaubleofTrueBlood-50354" value: { - dps: 7442.35817 - tps: 5346.74553 + dps: 7432.10593 + tps: 5339.54123 hps: 89.11518 } } dps_results: { key: "TestFeral-AllItems-BaubleofTrueBlood-50726" value: { - dps: 7442.35817 - tps: 5346.74553 + dps: 7432.10593 + tps: 5339.54123 hps: 89.11518 } } dps_results: { key: "TestFeral-AllItems-BeamingEarthsiegeDiamond" value: { - dps: 7572.42939 - tps: 5441.33969 + dps: 7581.66726 + tps: 5448.12294 } } dps_results: { key: "TestFeral-AllItems-BlessedRegaliaofUndeadCleansing" value: { - dps: 6153.48436 - tps: 4430.74768 + dps: 6161.77105 + tps: 4436.78081 } } dps_results: { key: "TestFeral-AllItems-BracingEarthsiegeDiamond" value: { - dps: 7540.79956 - tps: 5310.50486 + dps: 7536.62918 + tps: 5307.96957 } } dps_results: { key: "TestFeral-AllItems-BrutalGladiator'sIdolofResolve-35019" value: { - dps: 7580.68644 - tps: 5447.2022 + dps: 7571.50772 + tps: 5441.05924 } } dps_results: { key: "TestFeral-AllItems-ChaoticSkyflareDiamond" value: { - dps: 7721.48349 - tps: 5547.1681 + dps: 7731.06791 + tps: 5554.1974 } } dps_results: { key: "TestFeral-AllItems-CorpseTongueCoin-50349" value: { - dps: 7440.535 - tps: 5345.52586 + dps: 7428.7408 + tps: 5337.15198 } } dps_results: { key: "TestFeral-AllItems-CorpseTongueCoin-50352" value: { - dps: 7440.535 - tps: 5345.52586 + dps: 7428.7408 + tps: 5337.15198 } } dps_results: { key: "TestFeral-AllItems-CorrodedSkeletonKey-50356" value: { - dps: 7440.535 - tps: 5345.52586 + dps: 7428.7408 + tps: 5337.15198 hps: 64 } } dps_results: { key: "TestFeral-AllItems-DarkmoonCard:Berserker!-42989" value: { - dps: 7548.82337 - tps: 5422.26103 + dps: 7564.49077 + tps: 5433.53446 } } dps_results: { key: "TestFeral-AllItems-DarkmoonCard:Death-42990" value: { - dps: 7579.6359 - tps: 5444.2875 + dps: 7586.71654 + tps: 5449.53911 } } dps_results: { key: "TestFeral-AllItems-DarkmoonCard:Greatness-44255" value: { - dps: 7440.535 - tps: 5345.52586 + dps: 7428.7408 + tps: 5337.15198 } } dps_results: { key: "TestFeral-AllItems-DeadlyGladiator'sIdolofResolve-42588" value: { - dps: 7580.68644 - tps: 5447.2022 + dps: 7571.50772 + tps: 5441.05924 } } dps_results: { key: "TestFeral-AllItems-Death'sChoice-47464" value: { - dps: 7879.89291 - tps: 5657.32041 + dps: 7907.02477 + tps: 5676.95796 } } dps_results: { key: "TestFeral-AllItems-DeathKnight'sAnguish-38212" value: { - dps: 7530.59346 - tps: 5409.31779 + dps: 7562.74412 + tps: 5432.29434 } } dps_results: { key: "TestFeral-AllItems-Deathbringer'sWill-50362" value: { - dps: 7848.31059 - tps: 5635.04653 + dps: 7933.65368 + tps: 5695.2662 } } dps_results: { key: "TestFeral-AllItems-Deathbringer'sWill-50363" value: { - dps: 7951.12043 - tps: 5708.19109 + dps: 7924.05962 + tps: 5688.75355 } } dps_results: { key: "TestFeral-AllItems-Defender'sCode-40257" value: { - dps: 7440.535 - tps: 5345.52586 + dps: 7428.7408 + tps: 5337.15198 } } dps_results: { key: "TestFeral-AllItems-DestructiveSkyflareDiamond" value: { - dps: 7574.85944 - tps: 5443.06503 + dps: 7599.53793 + tps: 5460.58676 } } dps_results: { key: "TestFeral-AllItems-DislodgedForeignObject-50348" value: { - dps: 7576.50887 - tps: 5442.06731 + dps: 7613.18953 + tps: 5467.66186 } } dps_results: { key: "TestFeral-AllItems-DislodgedForeignObject-50353" value: { - dps: 7586.10803 - tps: 5448.80793 + dps: 7614.58577 + tps: 5469.02712 } } dps_results: { key: "TestFeral-AllItems-DreamwalkerBattlegear" value: { - dps: 6986.21073 - tps: 5022.28255 + dps: 6969.93218 + tps: 5010.27606 } } dps_results: { key: "TestFeral-AllItems-DreamwalkerGarb" value: { - dps: 5999.79447 - tps: 4323.19838 + dps: 6051.25058 + tps: 4360.55487 } } dps_results: { key: "TestFeral-AllItems-EffulgentSkyflareDiamond" value: { - dps: 7540.79956 - tps: 5418.88251 + dps: 7536.62918 + tps: 5416.29548 } } dps_results: { key: "TestFeral-AllItems-EmberSkyflareDiamond" value: { - dps: 7540.79956 - tps: 5418.88251 + dps: 7536.62918 + tps: 5416.29548 } } dps_results: { key: "TestFeral-AllItems-EnigmaticSkyflareDiamond" value: { - dps: 7572.42939 - tps: 5441.33969 + dps: 7581.66726 + tps: 5448.12294 } } dps_results: { key: "TestFeral-AllItems-EnigmaticStarflareDiamond" value: { - dps: 7568.51515 - tps: 5438.56058 + dps: 7573.82885 + tps: 5442.63246 } } dps_results: { key: "TestFeral-AllItems-EphemeralSnowflake-50260" value: { - dps: 7582.45439 - tps: 5446.21384 + dps: 7560.84326 + tps: 5430.64558 } } dps_results: { key: "TestFeral-AllItems-EssenceofGossamer-37220" value: { - dps: 7440.535 - tps: 5345.52586 + dps: 7428.7408 + tps: 5337.15198 } } dps_results: { key: "TestFeral-AllItems-EternalEarthsiegeDiamond" value: { - dps: 7540.79956 - tps: 5418.88251 + dps: 7536.62918 + tps: 5416.29548 } } dps_results: { key: "TestFeral-AllItems-ExtractofNecromanticPower-40373" value: { - dps: 7577.01094 - tps: 5442.27421 + dps: 7589.52932 + tps: 5451.16225 } } dps_results: { key: "TestFeral-AllItems-EyeoftheBroodmother-45308" value: { - dps: 7534.94859 - tps: 5412.33515 + dps: 7546.91067 + tps: 5421.05259 } } dps_results: { key: "TestFeral-AllItems-Figurine-SapphireOwl-42413" value: { - dps: 7440.535 - tps: 5345.52586 + dps: 7434.81229 + tps: 5341.46274 } } dps_results: { key: "TestFeral-AllItems-ForethoughtTalisman-40258" value: { - dps: 7440.535 - tps: 5345.52586 + dps: 7428.7408 + tps: 5337.15198 } } dps_results: { key: "TestFeral-AllItems-ForgeEmber-37660" value: { - dps: 7515.99818 - tps: 5398.88036 + dps: 7524.11985 + tps: 5404.79632 } } dps_results: { key: "TestFeral-AllItems-ForlornSkyflareDiamond" value: { - dps: 7540.79956 - tps: 5418.88251 + dps: 7536.62918 + tps: 5416.29548 } } dps_results: { key: "TestFeral-AllItems-ForlornStarflareDiamond" value: { - dps: 7540.79956 - tps: 5418.88251 + dps: 7536.62918 + tps: 5416.29548 } } dps_results: { key: "TestFeral-AllItems-FuriousGladiator'sIdolofResolve-42589" value: { - dps: 7580.68644 - tps: 5447.2022 + dps: 7571.50772 + tps: 5441.05924 } } dps_results: { key: "TestFeral-AllItems-FuryoftheFiveFlights-40431" value: { - dps: 7622.64184 - tps: 5474.82172 + dps: 7610.12383 + tps: 5465.93393 } } dps_results: { key: "TestFeral-AllItems-FuturesightRune-38763" value: { - dps: 7440.535 - tps: 5345.52586 + dps: 7428.7408 + tps: 5337.15198 } } dps_results: { key: "TestFeral-AllItems-Gladiator'sSanctuary" value: { - dps: 7543.92611 - tps: 5418.18569 + dps: 7534.84781 + tps: 5412.2636 } } dps_results: { key: "TestFeral-AllItems-Gladiator'sWildhide" value: { - dps: 6046.43779 - tps: 4354.8194 + dps: 6065.5199 + tps: 4368.44249 } } dps_results: { key: "TestFeral-AllItems-GlowingTwilightScale-54573" value: { - dps: 7440.535 - tps: 5345.52586 + dps: 7428.7408 + tps: 5337.15198 } } dps_results: { key: "TestFeral-AllItems-GlowingTwilightScale-54589" value: { - dps: 7440.535 - tps: 5345.52586 + dps: 7428.7408 + tps: 5337.15198 } } dps_results: { key: "TestFeral-AllItems-GnomishLightningGenerator-41121" value: { - dps: 7556.42819 - tps: 5427.81003 + dps: 7566.02669 + tps: 5434.47539 } } dps_results: { key: "TestFeral-AllItems-HatefulGladiator'sIdolofResolve-42587" value: { - dps: 7580.68644 - tps: 5447.2022 + dps: 7571.50772 + tps: 5441.05924 } } dps_results: { key: "TestFeral-AllItems-Heartpierce-49982" value: { - dps: 7819.56543 - tps: 5616.65671 + dps: 7890.83819 + tps: 5667.1108 } } dps_results: { key: "TestFeral-AllItems-Heartpierce-50641" value: { - dps: 7928.09901 - tps: 5693.56597 + dps: 7964.76651 + tps: 5719.45033 } } dps_results: { key: "TestFeral-AllItems-IdolofLunarFury-47670" value: { - dps: 7580.68644 - tps: 5447.2022 + dps: 7571.50772 + tps: 5441.05924 } } dps_results: { key: "TestFeral-AllItems-IdolofMutilation-47668" value: { - dps: 7859.80284 - tps: 5645.30005 + dps: 7900.9592 + tps: 5674.44629 } } dps_results: { key: "TestFeral-AllItems-IdoloftheCorruptor-45509" value: { - dps: 7580.68644 - tps: 5447.2022 + dps: 7571.50772 + tps: 5441.05924 } } dps_results: { key: "TestFeral-AllItems-IdoloftheCryingMoon-50456" value: { - dps: 7864.13569 - tps: 5648.45117 + dps: 7911.84486 + tps: 5682.24989 } } dps_results: { key: "TestFeral-AllItems-IdoloftheLunarEclipse-50457" value: { - dps: 7580.68644 - tps: 5447.2022 + dps: 7571.50772 + tps: 5441.05924 } } dps_results: { key: "TestFeral-AllItems-IdoloftheRavenGoddess-32387" value: { - dps: 7629.69366 - tps: 5481.99732 + dps: 7652.94361 + tps: 5498.43 } } dps_results: { key: "TestFeral-AllItems-IdoloftheUnseenMoon-33510" value: { - dps: 7580.68644 - tps: 5447.2022 + dps: 7571.50772 + tps: 5441.05924 } } dps_results: { key: "TestFeral-AllItems-IdoloftheWhiteStag-32257" value: { - dps: 7580.68644 - tps: 5447.2022 + dps: 7571.50772 + tps: 5441.05924 } } dps_results: { key: "TestFeral-AllItems-IllustrationoftheDragonSoul-40432" value: { - dps: 7440.535 - tps: 5345.52586 + dps: 7428.7408 + tps: 5337.15198 } } dps_results: { key: "TestFeral-AllItems-ImpassiveSkyflareDiamond" value: { - dps: 7572.42939 - tps: 5441.33969 + dps: 7581.66726 + tps: 5448.12294 } } dps_results: { key: "TestFeral-AllItems-ImpassiveStarflareDiamond" value: { - dps: 7568.51515 - tps: 5438.56058 + dps: 7573.82885 + tps: 5442.63246 } } dps_results: { key: "TestFeral-AllItems-IncisorFragment-37723" value: { - dps: 7613.50765 - tps: 5468.33645 + dps: 7598.33437 + tps: 5457.56341 } } dps_results: { key: "TestFeral-AllItems-InsightfulEarthsiegeDiamond" value: { - dps: 7540.79956 - tps: 5418.88251 + dps: 7536.62918 + tps: 5416.29548 } } dps_results: { key: "TestFeral-AllItems-InvigoratingEarthsiegeDiamond" value: { - dps: 7570.21933 - tps: 5439.77055 + dps: 7559.35874 + tps: 5432.43347 hps: 12.43348 } } dps_results: { key: "TestFeral-AllItems-LasherweaveBattlegear" value: { - dps: 9157.97168 - tps: 6563.93368 + dps: 9161.05773 + tps: 6566.42392 } } dps_results: { key: "TestFeral-AllItems-LasherweaveRegalia" value: { - dps: 6353.25438 - tps: 4624.12845 + dps: 6320.57363 + tps: 4599.00121 } } dps_results: { key: "TestFeral-AllItems-LastWord-50179" value: { - dps: 7871.93187 - tps: 5653.98645 + dps: 7862.21418 + tps: 5647.46083 } } dps_results: { key: "TestFeral-AllItems-LastWord-50708" value: { - dps: 7893.2594 - tps: 5669.129 + dps: 7883.53799 + tps: 5662.60073 } } dps_results: { key: "TestFeral-AllItems-Lavanthor'sTalisman-37872" value: { - dps: 7440.535 - tps: 5345.52586 + dps: 7428.7408 + tps: 5337.15198 } } dps_results: { key: "TestFeral-AllItems-MajesticDragonFigurine-40430" value: { - dps: 7440.535 - tps: 5345.52586 + dps: 7428.7408 + tps: 5337.15198 } } dps_results: { key: "TestFeral-AllItems-Malfurion'sBattlegear" value: { - dps: 7437.86949 - tps: 5345.65259 + dps: 7462.44065 + tps: 5363.62162 } } dps_results: { key: "TestFeral-AllItems-Malfurion'sRegalia" value: { - dps: 5830.88451 - tps: 4240.88911 + dps: 5864.10026 + tps: 4269.97411 } } dps_results: { key: "TestFeral-AllItems-MeteoriteWhetstone-37390" value: { - dps: 7591.15182 - tps: 5452.68816 + dps: 7642.36535 + tps: 5488.3019 } } dps_results: { key: "TestFeral-AllItems-NevermeltingIceCrystal-50259" value: { - dps: 7620.92991 - tps: 5473.38189 + dps: 7640.95591 + tps: 5487.97428 } } dps_results: { key: "TestFeral-AllItems-Nibelung-49992" value: { - dps: 7729.32786 - tps: 5552.7376 + dps: 7719.70313 + tps: 5546.27798 } } dps_results: { key: "TestFeral-AllItems-Nibelung-50648" value: { - dps: 7729.32786 - tps: 5552.7376 + dps: 7719.70313 + tps: 5546.27798 } } dps_results: { key: "TestFeral-AllItems-NightsongBattlegear" value: { - dps: 7356.83739 - tps: 5285.8762 + dps: 7376.68513 + tps: 5300.11767 } } dps_results: { key: "TestFeral-AllItems-NightsongGarb" value: { - dps: 5902.40371 - tps: 4257.19198 + dps: 5957.44997 + tps: 4296.4244 } } dps_results: { key: "TestFeral-AllItems-OfferingofSacrifice-37638" value: { - dps: 7440.535 - tps: 5345.52586 + dps: 7428.7408 + tps: 5337.15198 } } dps_results: { key: "TestFeral-AllItems-PersistentEarthshatterDiamond" value: { - dps: 7560.76457 - tps: 5433.05767 + dps: 7556.60221 + tps: 5430.47633 } } dps_results: { key: "TestFeral-AllItems-PersistentEarthsiegeDiamond" value: { - dps: 7565.46222 - tps: 5436.39301 + dps: 7561.30174 + tps: 5433.813 } } dps_results: { key: "TestFeral-AllItems-PetrifiedScarab-21685" value: { - dps: 7440.535 - tps: 5345.52586 + dps: 7428.7408 + tps: 5337.15198 } } dps_results: { key: "TestFeral-AllItems-PetrifiedTwilightScale-54571" value: { - dps: 7440.535 - tps: 5345.52586 + dps: 7428.7408 + tps: 5337.15198 } } dps_results: { key: "TestFeral-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 7440.535 - tps: 5345.52586 + dps: 7428.7408 + tps: 5337.15198 } } dps_results: { key: "TestFeral-AllItems-PowerfulEarthshatterDiamond" value: { - dps: 7540.79956 - tps: 5418.88251 + dps: 7536.62918 + tps: 5416.29548 } } dps_results: { key: "TestFeral-AllItems-PowerfulEarthsiegeDiamond" value: { - dps: 7540.79956 - tps: 5418.88251 + dps: 7536.62918 + tps: 5416.29548 } } dps_results: { key: "TestFeral-AllItems-PurifiedShardoftheGods" value: { - dps: 7440.535 - tps: 5345.52586 + dps: 7428.7408 + tps: 5337.15198 } } dps_results: { key: "TestFeral-AllItems-ReignoftheDead-47316" value: { - dps: 7440.535 - tps: 5345.52586 + dps: 7428.7408 + tps: 5337.15198 } } dps_results: { key: "TestFeral-AllItems-ReignoftheDead-47477" value: { - dps: 7440.535 - tps: 5345.52586 + dps: 7428.7408 + tps: 5337.15198 } } dps_results: { key: "TestFeral-AllItems-RelentlessEarthsiegeDiamond" value: { - dps: 7729.32786 - tps: 5552.7376 + dps: 7719.70313 + tps: 5546.27798 } } dps_results: { key: "TestFeral-AllItems-RelentlessGladiator'sIdolofResolve-42591" value: { - dps: 7580.68644 - tps: 5447.2022 + dps: 7571.50772 + tps: 5441.05924 } } dps_results: { key: "TestFeral-AllItems-RevitalizingSkyflareDiamond" value: { - dps: 7540.79956 - tps: 5418.88251 + dps: 7536.62918 + tps: 5416.29548 } } dps_results: { key: "TestFeral-AllItems-RuneofRepulsion-40372" value: { - dps: 7440.535 - tps: 5345.52586 + dps: 7428.7408 + tps: 5337.15198 } } dps_results: { key: "TestFeral-AllItems-SavageGladiator'sIdolofResolve-42574" value: { - dps: 7580.68644 - tps: 5447.2022 + dps: 7571.50772 + tps: 5441.05924 } } dps_results: { key: "TestFeral-AllItems-SealofthePantheon-36993" value: { - dps: 7440.535 - tps: 5345.52586 + dps: 7428.7408 + tps: 5337.15198 } } dps_results: { key: "TestFeral-AllItems-ShinyShardoftheGods" value: { - dps: 7440.535 - tps: 5345.52586 + dps: 7428.7408 + tps: 5337.15198 } } dps_results: { key: "TestFeral-AllItems-Sindragosa'sFlawlessFang-50361" value: { - dps: 7440.535 - tps: 5345.52586 + dps: 7428.7408 + tps: 5337.15198 } } dps_results: { key: "TestFeral-AllItems-SliverofPureIce-50339" value: { - dps: 7440.535 - tps: 5345.52586 + dps: 7428.7408 + tps: 5337.15198 } } dps_results: { key: "TestFeral-AllItems-SliverofPureIce-50346" value: { - dps: 7440.535 - tps: 5345.52586 + dps: 7428.7408 + tps: 5337.15198 } } dps_results: { key: "TestFeral-AllItems-SoulPreserver-37111" value: { - dps: 7440.535 - tps: 5345.52586 + dps: 7428.7408 + tps: 5337.15198 } } dps_results: { key: "TestFeral-AllItems-SouloftheDead-40382" value: { - dps: 7536.83418 - tps: 5413.67392 + dps: 7548.70602 + tps: 5422.32729 } } dps_results: { key: "TestFeral-AllItems-SparkofLife-37657" value: { - dps: 7476.36735 - tps: 5370.89205 + dps: 7522.5896 + tps: 5403.56027 } } dps_results: { key: "TestFeral-AllItems-SphereofRedDragon'sBlood-37166" value: { - dps: 7588.31054 - tps: 5451.5683 + dps: 7599.16715 + tps: 5459.72521 } } dps_results: { key: "TestFeral-AllItems-StormshroudArmor" value: { - dps: 6281.06941 - tps: 4520.95913 + dps: 6263.17795 + tps: 4508.18141 } } dps_results: { key: "TestFeral-AllItems-SwiftSkyflareDiamond" value: { - dps: 7565.46222 - tps: 5436.39301 + dps: 7561.30174 + tps: 5433.813 } } dps_results: { key: "TestFeral-AllItems-SwiftStarflareDiamond" value: { - dps: 7560.76457 - tps: 5433.05767 + dps: 7556.60221 + tps: 5430.47633 } } dps_results: { key: "TestFeral-AllItems-SwiftWindfireDiamond" value: { - dps: 7552.54368 - tps: 5427.22084 + dps: 7548.37802 + tps: 5424.63715 } } dps_results: { key: "TestFeral-AllItems-TalismanofTrollDivinity-37734" value: { - dps: 7440.535 - tps: 5345.52586 + dps: 7428.7408 + tps: 5337.15198 } } dps_results: { key: "TestFeral-AllItems-TearsoftheVanquished-47215" value: { - dps: 7440.535 - tps: 5345.52586 + dps: 7428.7408 + tps: 5337.15198 } } dps_results: { key: "TestFeral-AllItems-TheGeneral'sHeart-45507" value: { - dps: 7440.535 - tps: 5345.52586 + dps: 7428.7408 + tps: 5337.15198 } } dps_results: { key: "TestFeral-AllItems-ThunderheartHarness" value: { - dps: 6068.99471 - tps: 4372.03141 + dps: 6074.47268 + tps: 4375.24768 } } dps_results: { key: "TestFeral-AllItems-ThunderheartRegalia" value: { - dps: 5245.72673 - tps: 3788.10943 + dps: 5248.04707 + tps: 3789.30815 } } dps_results: { key: "TestFeral-AllItems-ThunderingSkyflareDiamond" value: { - dps: 7633.72556 - tps: 5485.15912 + dps: 7627.99549 + tps: 5481.01598 } } dps_results: { key: "TestFeral-AllItems-TinyAbominationinaJar-50351" value: { - dps: 7595.71695 - tps: 5458.17301 + dps: 7643.13222 + tps: 5491.83785 } } dps_results: { key: "TestFeral-AllItems-TinyAbominationinaJar-50706" value: { - dps: 7630.3042 - tps: 5482.35602 + dps: 7690.31775 + tps: 5525.48915 } } dps_results: { key: "TestFeral-AllItems-TirelessSkyflareDiamond" value: { - dps: 7540.79956 - tps: 5418.88251 + dps: 7536.62918 + tps: 5416.29548 } } dps_results: { key: "TestFeral-AllItems-TirelessStarflareDiamond" value: { - dps: 7540.79956 - tps: 5418.88251 + dps: 7536.62918 + tps: 5416.29548 } } dps_results: { key: "TestFeral-AllItems-TomeofArcanePhenomena-36972" value: { - dps: 7475.12972 - tps: 5370.01333 + dps: 7476.76644 + tps: 5371.39976 } } dps_results: { key: "TestFeral-AllItems-TrenchantEarthshatterDiamond" value: { - dps: 7540.79956 - tps: 5418.88251 + dps: 7536.62918 + tps: 5416.29548 } } dps_results: { key: "TestFeral-AllItems-TrenchantEarthsiegeDiamond" value: { - dps: 7540.79956 - tps: 5418.88251 + dps: 7536.62918 + tps: 5416.29548 } } dps_results: { key: "TestFeral-AllItems-UndeadSlayer'sBlessedArmor" value: { - dps: 6431.95209 - tps: 4628.75892 + dps: 6444.03578 + tps: 4636.9644 } } dps_results: { key: "TestFeral-AllItems-Val'anyr,HammerofAncientKings-46017" value: { - dps: 6337.36366 - tps: 4564.89175 + dps: 6361.77501 + tps: 4582.14902 } } dps_results: { key: "TestFeral-AllItems-VengefulGladiator'sIdolofResolve-33947" value: { - dps: 7580.68644 - tps: 5447.2022 + dps: 7571.50772 + tps: 5441.05924 } } dps_results: { key: "TestFeral-AllItems-WingedTalisman-37844" value: { - dps: 7440.535 - tps: 5345.52586 + dps: 7428.7408 + tps: 5337.15198 } } dps_results: { key: "TestFeral-AllItems-WrathfulGladiator'sIdolofResolve-51429" value: { - dps: 7580.68644 - tps: 5447.2022 + dps: 7571.50772 + tps: 5441.05924 } } dps_results: { key: "TestFeral-Average-Default" value: { - dps: 7787.06524 - tps: 5593.70579 + dps: 7811.24827 + tps: 5610.84622 } } dps_results: { - key: "TestFeral-Settings-Tauren-p1-Default--FullBuffs-LongMultiTarget" + key: "TestFeral-Settings-Tauren-p1-Default-NoBleed-default-FullBuffs-LongMultiTarget" value: { - dps: 7729.32786 - tps: 5552.7376 + dps: 7757.20262 + tps: 5572.75304 } } dps_results: { - key: "TestFeral-Settings-Tauren-p1-Default--FullBuffs-LongSingleTarget" + key: "TestFeral-Settings-Tauren-p1-Default-NoBleed-default-FullBuffs-LongSingleTarget" value: { - dps: 7729.32786 - tps: 5552.7376 + dps: 7757.20262 + tps: 5572.75304 } } dps_results: { - key: "TestFeral-Settings-Tauren-p1-Default--FullBuffs-ShortSingleTarget" + key: "TestFeral-Settings-Tauren-p1-Default-NoBleed-default-FullBuffs-ShortSingleTarget" value: { - dps: 8471.74596 - tps: 6072.52536 + dps: 8518.85427 + tps: 6104.1026 } } dps_results: { - key: "TestFeral-Settings-Tauren-p1-Default--NoBuffs-LongMultiTarget" + key: "TestFeral-Settings-Tauren-p1-Default-NoBleed-default-NoBuffs-LongMultiTarget" value: { - dps: 4853.83095 - tps: 3509.33992 + dps: 4868.22297 + tps: 3519.63304 } } dps_results: { - key: "TestFeral-Settings-Tauren-p1-Default--NoBuffs-LongSingleTarget" + key: "TestFeral-Settings-Tauren-p1-Default-NoBleed-default-NoBuffs-LongSingleTarget" value: { - dps: 4853.83095 - tps: 3509.33992 + dps: 4868.22297 + tps: 3519.63304 } } dps_results: { - key: "TestFeral-Settings-Tauren-p1-Default--NoBuffs-ShortSingleTarget" + key: "TestFeral-Settings-Tauren-p1-Default-NoBleed-default-NoBuffs-ShortSingleTarget" value: { - dps: 5098.10689 - tps: 3674.62409 + dps: 5130.23089 + tps: 3695.56247 } } dps_results: { - key: "TestFeral-Settings-Tauren-p1-Default-NoBleed--FullBuffs-LongMultiTarget" + key: "TestFeral-Settings-Tauren-p1-Default-default-FullBuffs-LongMultiTarget" value: { - dps: 7760.70989 - tps: 5575.09364 + dps: 7719.70313 + tps: 5546.27798 } } dps_results: { - key: "TestFeral-Settings-Tauren-p1-Default-NoBleed--FullBuffs-LongSingleTarget" + key: "TestFeral-Settings-Tauren-p1-Default-default-FullBuffs-LongSingleTarget" value: { - dps: 7760.70989 - tps: 5575.09364 + dps: 7719.70313 + tps: 5546.27798 } } dps_results: { - key: "TestFeral-Settings-Tauren-p1-Default-NoBleed--FullBuffs-ShortSingleTarget" + key: "TestFeral-Settings-Tauren-p1-Default-default-FullBuffs-ShortSingleTarget" value: { - dps: 8611.01764 - tps: 6170.66039 + dps: 8577.90161 + tps: 6144.53048 } } dps_results: { - key: "TestFeral-Settings-Tauren-p1-Default-NoBleed--NoBuffs-LongMultiTarget" + key: "TestFeral-Settings-Tauren-p1-Default-default-NoBuffs-LongMultiTarget" value: { - dps: 4873.94512 - tps: 3523.84534 + dps: 4888.61078 + tps: 3534.33275 } } dps_results: { - key: "TestFeral-Settings-Tauren-p1-Default-NoBleed--NoBuffs-LongSingleTarget" + key: "TestFeral-Settings-Tauren-p1-Default-default-NoBuffs-LongSingleTarget" value: { - dps: 4873.94512 - tps: 3523.84534 + dps: 4888.61078 + tps: 3534.33275 } } dps_results: { - key: "TestFeral-Settings-Tauren-p1-Default-NoBleed--NoBuffs-ShortSingleTarget" + key: "TestFeral-Settings-Tauren-p1-Default-default-NoBuffs-ShortSingleTarget" value: { - dps: 5077.18897 - tps: 3660.52024 + dps: 5170.54181 + tps: 3724.18322 } } dps_results: { - key: "TestFeral-Settings-Tauren-p1-Flower-Aoe--FullBuffs-LongMultiTarget" + key: "TestFeral-Settings-Tauren-p1-Flower-Aoe-default-FullBuffs-LongMultiTarget" value: { - dps: 22991.29088 - tps: 16642.62728 + dps: 7757.20262 + tps: 5572.75304 } } dps_results: { - key: "TestFeral-Settings-Tauren-p1-Flower-Aoe--FullBuffs-LongSingleTarget" + key: "TestFeral-Settings-Tauren-p1-Flower-Aoe-default-FullBuffs-LongSingleTarget" value: { - dps: 4747.28257 - tps: 3448.77157 + dps: 7757.20262 + tps: 5572.75304 } } dps_results: { - key: "TestFeral-Settings-Tauren-p1-Flower-Aoe--FullBuffs-ShortSingleTarget" + key: "TestFeral-Settings-Tauren-p1-Flower-Aoe-default-FullBuffs-ShortSingleTarget" value: { - dps: 5662.69986 - tps: 4084.40887 + dps: 8518.85427 + tps: 6104.1026 } } dps_results: { - key: "TestFeral-Settings-Tauren-p1-Flower-Aoe--NoBuffs-LongMultiTarget" + key: "TestFeral-Settings-Tauren-p1-Flower-Aoe-default-NoBuffs-LongMultiTarget" value: { - dps: 14733.47866 - tps: 10879.36617 + dps: 4868.22297 + tps: 3519.63304 } } dps_results: { - key: "TestFeral-Settings-Tauren-p1-Flower-Aoe--NoBuffs-LongSingleTarget" + key: "TestFeral-Settings-Tauren-p1-Flower-Aoe-default-NoBuffs-LongSingleTarget" value: { - dps: 2572.3973 - tps: 1908.02844 + dps: 4868.22297 + tps: 3519.63304 } } dps_results: { - key: "TestFeral-Settings-Tauren-p1-Flower-Aoe--NoBuffs-ShortSingleTarget" + key: "TestFeral-Settings-Tauren-p1-Flower-Aoe-default-NoBuffs-ShortSingleTarget" value: { - dps: 2863.73277 - tps: 2097.93465 + dps: 5130.23089 + tps: 3695.56247 } } dps_results: { key: "TestFeral-SwitchInFrontOfTarget-Default" value: { - dps: 6283.32018 - tps: 4524.65121 + dps: 6340.53417 + tps: 4564.97399 } } diff --git a/sim/druid/feral/feral_test.go b/sim/druid/feral/feral_test.go index 31518cc41e..e59ed5bc76 100644 --- a/sim/druid/feral/feral_test.go +++ b/sim/druid/feral/feral_test.go @@ -40,6 +40,7 @@ func TestFeral(t *testing.T) { {Label: "Default-NoBleed", SpecOptions: PlayerOptionsMonoCatNoBleed}, {Label: "Flower-Aoe", SpecOptions: PlayerOptionsFlowerCatAoe}, }, + Rotation: core.GetAplRotation("../../../ui/feral_druid/apls", "default"), ItemFilter: FeralItemFilter, })) } @@ -190,26 +191,3 @@ var FullConsumes = &proto.Consumes{ DefaultPotion: proto.Potions_HastePotion, DefaultConjured: proto.Conjured_ConjuredDarkRune, } - -var P2GearDoubleArmorPenTrinkets = core.EquipmentSpecFromJsonString(` -{ - "items": [ - {"id":46161,"enchant":3817,"gems":[41398,40002]}, - {"id":45517,"gems":[40002]}, - {"id":45245,"enchant":3808,"gems":[40002,40002]}, - {"id":46032,"enchant":3605,"gems":[40002,40058]}, - {"id":45473,"enchant":3832,"gems":[40002,40002,40002]}, - {"id":45869,"enchant":3845,"gems":[40037,0]}, - {"id":46158,"enchant":3604,"gems":[40002,0]}, - {"id":46095,"gems":[40002,40002,40002]}, - {"id":45536,"enchant":3823,"gems":[39996,39996,39996]}, - {"id":45564,"enchant":3606,"gems":[39996,39996]}, - {"id":46048,"gems":[45862]}, - {"id":45608,"gems":[39996]}, - {"id":45931}, - {"id":40256}, - {"id":45613,"enchant":3789,"gems":[40037,42702]}, - {}, - {"id":40713} - ] -}`)