diff --git a/sim/druid/guardian/TestGuardian.results b/sim/druid/guardian/TestGuardian.results index 840883f50b..37bb75221c 100644 --- a/sim/druid/guardian/TestGuardian.results +++ b/sim/druid/guardian/TestGuardian.results @@ -2,1537 +2,1537 @@ character_stats_results: { key: "TestGuardian-CharacterStats-Default" value: { final_stats: 682.5 - final_stats: 4053 - final_stats: 11018.49966 + final_stats: 4625.25 + final_stats: 11282.1471 final_stats: 177.6348 final_stats: 175 - final_stats: 182 - final_stats: 1695 - final_stats: 310 - final_stats: 83 - final_stats: 4012.59098 + final_stats: 177 + final_stats: 385 + final_stats: 460 + final_stats: 96 + final_stats: 4452.21328 final_stats: 0 - final_stats: 730 - final_stats: 13520.25 + final_stats: 840 + final_stats: 15237 final_stats: 0 final_stats: 184.39828 final_stats: 0 - final_stats: 158 + final_stats: 1610 final_stats: 0 final_stats: 97 final_stats: 97 final_stats: 97 final_stats: 97 - final_stats: 46177.25153 - final_stats: 1629 - final_stats: 195508.64524 + final_stats: 47799.5522 + final_stats: 1775 + final_stats: 199199.7094 final_stats: 26617.3503 final_stats: 1257.75 - final_stats: 1.51529 - final_stats: 1.77655 - final_stats: 34.49428 - final_stats: 16.57243 + final_stats: 1.47366 + final_stats: 1.72774 + final_stats: 28.96125 + final_stats: 9.26543 final_stats: 5 } } dps_results: { key: "TestGuardian-AllItems-AgileShadowspiritDiamond" value: { - dps: 7735.13962 - tps: 38740.8381 + dps: 7971.9825 + tps: 39922.53564 } } dps_results: { key: "TestGuardian-AllItems-Althor'sAbacus-50366" value: { - dps: 7536.71692 - tps: 37748.62041 + dps: 7810.92835 + tps: 39117.1707 } } dps_results: { key: "TestGuardian-AllItems-AncientPetrifiedSeed-69001" value: { - dps: 7874.90018 - tps: 39439.88175 + dps: 8170.40748 + tps: 40914.70179 } } dps_results: { key: "TestGuardian-AllItems-Anhuur'sHymnal-55889" value: { - dps: 7839.54716 - tps: 39264.97038 + dps: 8094.92122 + tps: 40538.47046 } } dps_results: { key: "TestGuardian-AllItems-Anhuur'sHymnal-56407" value: { - dps: 7866.23787 - tps: 39398.22308 + dps: 8031.35254 + tps: 40221.0054 } } dps_results: { key: "TestGuardian-AllItems-ApparatusofKhaz'goroth-68972" value: { - dps: 7843.78516 - tps: 39285.30684 + dps: 7960.01875 + tps: 39862.59771 } } dps_results: { key: "TestGuardian-AllItems-ApparatusofKhaz'goroth-69113" value: { - dps: 7887.29914 - tps: 39502.63676 + dps: 7979.62231 + tps: 39960.61553 } } dps_results: { key: "TestGuardian-AllItems-AustereShadowspiritDiamond" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-BaubleofTrueBlood-50726" value: { - dps: 7551.55167 - tps: 37822.88171 - hps: 102.40764 - } -} -dps_results: { - key: "TestGuardian-AllItems-BedrockTalisman-58182" - value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 + hps: 89.90929 } } dps_results: { key: "TestGuardian-AllItems-BellofEnragingResonance-59326" value: { - dps: 7629.07757 - tps: 38210.70199 + dps: 7878.97564 + tps: 39457.88738 } } dps_results: { key: "TestGuardian-AllItems-BellofEnragingResonance-65053" value: { - dps: 7596.27723 - tps: 38047.08053 + dps: 7942.57878 + tps: 39776.22555 } } dps_results: { key: "TestGuardian-AllItems-BindingPromise-67037" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-Blood-SoakedAleMug-63843" value: { - dps: 7808.2774 - tps: 39106.62347 + dps: 8011.21789 + tps: 40119.01048 } } dps_results: { key: "TestGuardian-AllItems-BloodofIsiset-55995" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-BloodofIsiset-56414" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-BloodthirstyGladiator'sBadgeofConquest-64687" value: { - dps: 8018.56681 - tps: 40158.203 + dps: 8250.29562 + tps: 41313.54623 } } dps_results: { key: "TestGuardian-AllItems-BloodthirstyGladiator'sBadgeofDominance-64688" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-BloodthirstyGladiator'sBadgeofVictory-64689" value: { - dps: 7703.15996 - tps: 38580.92313 + dps: 7953.41528 + tps: 39829.58034 } } dps_results: { key: "TestGuardian-AllItems-BloodthirstyGladiator'sEmblemofCruelty-64740" value: { - dps: 7603.55482 - tps: 38082.87828 + dps: 7873.28357 + tps: 39429.52701 } } dps_results: { key: "TestGuardian-AllItems-BloodthirstyGladiator'sEmblemofMeditation-64741" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-BloodthirstyGladiator'sEmblemofTenacity-64742" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-BloodthirstyGladiator'sInsigniaofConquest-64761" value: { - dps: 7893.16172 - tps: 39530.98443 + dps: 8114.53744 + tps: 40635.11386 } } dps_results: { key: "TestGuardian-AllItems-BloodthirstyGladiator'sInsigniaofDominance-64762" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-BloodthirstyGladiator'sInsigniaofVictory-64763" value: { - dps: 7672.72615 - tps: 38428.75407 + dps: 7929.71988 + tps: 39711.10334 } } dps_results: { key: "TestGuardian-AllItems-BottledLightning-66879" value: { - dps: 7614.09368 - tps: 38135.51465 + dps: 7814.15351 + tps: 39133.36401 } } dps_results: { key: "TestGuardian-AllItems-BracingShadowspiritDiamond" value: { - dps: 7536.71692 - tps: 36993.88592 + dps: 7810.92835 + tps: 38335.03717 } } dps_results: { key: "TestGuardian-AllItems-Brawler'sTrophy-71338" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-BurningShadowspiritDiamond" value: { - dps: 7655.47217 - tps: 38342.39666 + dps: 7920.12202 + tps: 39663.13905 } } dps_results: { key: "TestGuardian-AllItems-ChaoticShadowspiritDiamond" value: { - dps: 7682.28034 - tps: 38476.37233 + dps: 7932.58937 + tps: 39725.51997 } } dps_results: { key: "TestGuardian-AllItems-Coren'sChilledChromiumCoaster-71335" value: { - dps: 7844.56308 - tps: 39288.27063 + dps: 8079.35998 + tps: 40459.94157 } } dps_results: { key: "TestGuardian-AllItems-CoreofRipeness-58184" value: { - dps: 7521.82209 - tps: 37674.2363 + dps: 7812.79531 + tps: 39126.51635 } } dps_results: { key: "TestGuardian-AllItems-CorpseTongueCoin-50349" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-CrushingWeight-59506" value: { - dps: 7810.4035 - tps: 39118.17751 + dps: 7965.41071 + tps: 39889.7802 } } dps_results: { key: "TestGuardian-AllItems-CrushingWeight-65118" value: { - dps: 7783.56395 - tps: 38984.00496 + dps: 8027.89918 + tps: 40203.14359 } } dps_results: { key: "TestGuardian-AllItems-DarkmoonCard:Earthquake-62048" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-DarkmoonCard:Hurricane-62049" value: { - dps: 7938.20686 - tps: 39755.76744 + dps: 8072.75059 + tps: 40426.07294 } } dps_results: { key: "TestGuardian-AllItems-DarkmoonCard:Hurricane-62051" value: { - dps: 8073.46688 - tps: 40432.47023 + dps: 8320.28293 + tps: 41664.69588 } } dps_results: { key: "TestGuardian-AllItems-DarkmoonCard:Tsunami-62050" value: { - dps: 7521.82209 - tps: 37674.2363 + dps: 7812.79531 + tps: 39126.51635 } } dps_results: { key: "TestGuardian-AllItems-DarkmoonCard:Volcano-62047" value: { - dps: 7567.00793 - tps: 37953.51974 + dps: 7853.19704 + tps: 39376.96198 } } dps_results: { key: "TestGuardian-AllItems-Deathbringer'sWill-50363" value: { - dps: 7705.7397 - tps: 38593.81623 + dps: 8012.47147 + tps: 40125.41236 } } dps_results: { key: "TestGuardian-AllItems-DestructiveShadowspiritDiamond" value: { - dps: 7561.32083 - tps: 37871.57476 + dps: 7822.34711 + tps: 39174.30867 } } dps_results: { key: "TestGuardian-AllItems-DislodgedForeignObject-50348" value: { - dps: 7564.24845 - tps: 37886.40435 + dps: 7778.63864 + tps: 38956.03714 } } dps_results: { key: "TestGuardian-AllItems-Dwyer'sCaber-70141" value: { - dps: 7795.82525 - tps: 39045.26311 + dps: 8114.40696 + tps: 40635.1677 } } dps_results: { key: "TestGuardian-AllItems-EffulgentShadowspiritDiamond" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-ElectrosparkHeartstarter-67118" value: { - dps: 7555.91823 - tps: 37874.22522 + dps: 7812.79531 + tps: 39154.28703 } } dps_results: { key: "TestGuardian-AllItems-EmberShadowspiritDiamond" value: { - dps: 7536.71692 - tps: 37748.62041 + dps: 7810.92835 + tps: 39117.1707 } } dps_results: { key: "TestGuardian-AllItems-EnigmaticShadowspiritDiamond" value: { - dps: 7561.32083 - tps: 37871.57476 + dps: 7822.34711 + tps: 39174.30867 } } dps_results: { key: "TestGuardian-AllItems-EssenceoftheCyclone-59473" value: { - dps: 8010.65085 - tps: 40119.83114 + dps: 8275.07683 + tps: 41439.12311 } } dps_results: { key: "TestGuardian-AllItems-EssenceoftheCyclone-65140" value: { - dps: 8010.87773 - tps: 40121.09929 + dps: 8342.19953 + tps: 41774.27703 } } dps_results: { key: "TestGuardian-AllItems-EssenceoftheEternalFlame-69002" value: { - dps: 7710.08407 - tps: 38615.54368 + dps: 7958.85306 + tps: 39856.76925 } } dps_results: { key: "TestGuardian-AllItems-EternalShadowspiritDiamond" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-FallofMortality-59500" value: { - dps: 7521.82209 - tps: 37674.2363 + dps: 7812.79531 + tps: 39126.51635 } } dps_results: { key: "TestGuardian-AllItems-FallofMortality-65124" value: { - dps: 7521.82209 - tps: 37674.2363 + dps: 7812.79531 + tps: 39126.51635 } } dps_results: { key: "TestGuardian-AllItems-FieryQuintessence-69000" value: { - dps: 7527.05713 - tps: 37779.37189 + dps: 7790.92127 + tps: 39092.23054 } } dps_results: { key: "TestGuardian-AllItems-Figurine-DemonPanther-52199" value: { - dps: 8153.35705 - tps: 40834.33965 + dps: 8466.33124 + tps: 42397.00476 } } dps_results: { key: "TestGuardian-AllItems-Figurine-DreamOwl-52354" value: { - dps: 7521.82209 - tps: 37674.2363 + dps: 7810.92835 + tps: 39117.1707 } } dps_results: { key: "TestGuardian-AllItems-Figurine-EarthenGuardian-52352" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-Figurine-JeweledSerpent-52353" value: { - dps: 7521.82209 - tps: 37674.2363 + dps: 7810.92835 + tps: 39117.1707 } } dps_results: { key: "TestGuardian-AllItems-Figurine-KingofBoars-52351" value: { - dps: 7693.68444 - tps: 38533.54554 + dps: 7944.44279 + tps: 39784.71789 } } dps_results: { key: "TestGuardian-AllItems-FleetShadowspiritDiamond" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-FluidDeath-58181" value: { - dps: 8300.65182 - tps: 41571.12139 + dps: 8518.1017 + tps: 42655.53747 } } dps_results: { key: "TestGuardian-AllItems-ForlornShadowspiritDiamond" value: { - dps: 7536.71692 - tps: 37748.62041 + dps: 7810.92835 + tps: 39117.1707 } } dps_results: { key: "TestGuardian-AllItems-FuryofAngerforge-59461" value: { - dps: 7780.98329 - tps: 38970.23063 + dps: 8022.78101 + tps: 40176.91423 } } dps_results: { key: "TestGuardian-AllItems-GaleofShadows-56138" value: { - dps: 7668.40529 - tps: 38407.62437 + dps: 7811.11417 + tps: 39119.14817 } } dps_results: { key: "TestGuardian-AllItems-GaleofShadows-56462" value: { - dps: 7612.47847 - tps: 38128.03233 + dps: 7780.1099 + tps: 38963.682 } } dps_results: { key: "TestGuardian-AllItems-GearDetector-61462" value: { - dps: 7768.532 - tps: 38908.73791 + dps: 8036.17822 + tps: 40243.3757 } } dps_results: { key: "TestGuardian-AllItems-Gladiator'sSanctuary" value: { - dps: 7419.94906 - tps: 37163.80175 + dps: 7566.29162 + tps: 37894.26812 } } dps_results: { key: "TestGuardian-AllItems-GlowingTwilightScale-54589" value: { - dps: 7537.14209 - tps: 37750.75047 + dps: 7810.92835 + tps: 39117.1707 } } dps_results: { key: "TestGuardian-AllItems-GraceoftheHerald-55266" value: { - dps: 7757.24022 - tps: 38851.45213 + dps: 8061.33778 + tps: 40369.85205 } } dps_results: { key: "TestGuardian-AllItems-GraceoftheHerald-56295" value: { - dps: 7916.88676 - tps: 39650.02235 + dps: 8177.33571 + tps: 40949.89668 } } dps_results: { key: "TestGuardian-AllItems-HarmlightToken-63839" value: { - dps: 7634.01723 - tps: 38235.12616 + dps: 7903.82535 + tps: 39581.65569 } } dps_results: { key: "TestGuardian-AllItems-Harrison'sInsigniaofPanache-65803" value: { - dps: 7648.14376 - tps: 38305.84213 + dps: 7901.60013 + tps: 39570.5046 } } dps_results: { key: "TestGuardian-AllItems-HeartofIgnacious-59514" value: { - dps: 7614.41646 - tps: 38137.99708 + dps: 7843.60495 + tps: 39281.44454 } } dps_results: { key: "TestGuardian-AllItems-HeartofIgnacious-65110" value: { - dps: 7555.81134 - tps: 37844.9611 + dps: 7843.39637 + tps: 39280.04038 } } dps_results: { key: "TestGuardian-AllItems-HeartofRage-59224" value: { - dps: 8156.64667 - tps: 40848.50459 + dps: 8443.40082 + tps: 42280.27994 } } dps_results: { key: "TestGuardian-AllItems-HeartofRage-65072" value: { - dps: 8209.30161 - tps: 41112.48849 + dps: 8431.22139 + tps: 42219.70864 } } dps_results: { key: "TestGuardian-AllItems-HeartofSolace-55868" value: { - dps: 7769.45353 - tps: 38912.86558 + dps: 7904.2966 + tps: 39585.06031 } } dps_results: { key: "TestGuardian-AllItems-HeartofSolace-56393" value: { - dps: 7766.19932 - tps: 38896.63661 + dps: 7926.58815 + tps: 39696.07326 } } dps_results: { key: "TestGuardian-AllItems-HeartofThunder-55845" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 + } +} +dps_results: { + key: "TestGuardian-AllItems-HeartofThunder-56370" + value: { + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-HeartoftheVile-66969" value: { - dps: 7842.45166 - tps: 39277.90269 + dps: 8095.56685 + tps: 40540.41339 } } dps_results: { key: "TestGuardian-AllItems-Heartpierce-50641" value: { - dps: 7722.40139 - tps: 38679.57278 + dps: 7870.52004 + tps: 39417.58164 } } dps_results: { key: "TestGuardian-AllItems-ImpassiveShadowspiritDiamond" value: { - dps: 7561.32083 - tps: 37871.57476 + dps: 7822.34711 + tps: 39174.30867 } } dps_results: { key: "TestGuardian-AllItems-ImpatienceofYouth-62464" value: { - dps: 7711.63805 - tps: 38623.31361 + dps: 7961.44329 + tps: 39869.72042 } } dps_results: { key: "TestGuardian-AllItems-ImpatienceofYouth-62469" value: { - dps: 7711.63805 - tps: 38623.31361 + dps: 7961.44329 + tps: 39869.72042 } } dps_results: { key: "TestGuardian-AllItems-ImpetuousQuery-55881" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-ImpetuousQuery-56406" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-InsigniaofDiplomacy-61433" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-InsigniaoftheEarthenLord-61429" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-JarofAncientRemedies-59354" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-JarofAncientRemedies-65029" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-JujuofNimbleness-63840" value: { - dps: 7808.2774 - tps: 39106.62347 + dps: 8011.21789 + tps: 40119.01048 } } dps_results: { key: "TestGuardian-AllItems-KeytotheEndlessChamber-55795" value: { - dps: 8029.3351 - tps: 40214.16487 + dps: 8282.83426 + tps: 41478.63089 } } dps_results: { key: "TestGuardian-AllItems-KeytotheEndlessChamber-56328" value: { - dps: 8213.83606 - tps: 41136.89071 + dps: 8441.72279 + tps: 42273.24876 } } dps_results: { key: "TestGuardian-AllItems-KvaldirBattleStandard-59685" value: { - dps: 7593.22647 - tps: 38031.89278 + dps: 7844.54472 + tps: 39285.40841 } } dps_results: { key: "TestGuardian-AllItems-KvaldirBattleStandard-59689" value: { - dps: 7593.22647 - tps: 38031.89278 + dps: 7844.54472 + tps: 39285.40841 } } dps_results: { key: "TestGuardian-AllItems-LadyLa-La'sSingingShell-67152" value: { - dps: 7552.8472 - tps: 37828.69954 + dps: 7838.51571 + tps: 39255.39103 } } dps_results: { key: "TestGuardian-AllItems-LastWord-50708" value: { - dps: 7597.48781 - tps: 38052.5624 + dps: 7853.44013 + tps: 39329.70462 } } dps_results: { key: "TestGuardian-AllItems-LeadenDespair-55816" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-LeftEyeofRajh-56102" value: { - dps: 8160.52798 - tps: 40868.22696 + dps: 8488.64519 + tps: 42505.89847 } } dps_results: { key: "TestGuardian-AllItems-LeftEyeofRajh-56427" value: { - dps: 8377.42763 - tps: 41953.29417 + dps: 8571.11483 + tps: 42918.92747 } } dps_results: { key: "TestGuardian-AllItems-LicensetoSlay-58180" value: { - dps: 8040.9597 - tps: 40271.49391 + dps: 8262.68694 + tps: 41378.46451 } } dps_results: { key: "TestGuardian-AllItems-MagnetiteMirror-55814" value: { - dps: 7915.29368 - tps: 39641.68487 + dps: 8206.15163 + tps: 41093.52858 } } dps_results: { key: "TestGuardian-AllItems-MagnetiteMirror-56345" value: { - dps: 8137.51888 - tps: 40753.14438 + dps: 8407.90134 + tps: 42102.33252 } } dps_results: { key: "TestGuardian-AllItems-MandalaofStirringPatterns-62467" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-MandalaofStirringPatterns-62472" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-MarkofKhardros-56132" value: { - dps: 7655.57392 - tps: 38342.99293 + dps: 7908.65741 + tps: 39605.79101 } } dps_results: { key: "TestGuardian-AllItems-MarkofKhardros-56458" value: { - dps: 7669.19588 - tps: 38411.10274 + dps: 7921.59576 + tps: 39670.48277 } } dps_results: { key: "TestGuardian-AllItems-MatrixRestabilizer-68994" value: { - dps: 8178.6549 - tps: 40959.72327 + dps: 8192.55026 + tps: 41025.73857 } } dps_results: { key: "TestGuardian-AllItems-MatrixRestabilizer-69150" value: { - dps: 8220.48321 - tps: 41169.74958 + dps: 8264.59613 + tps: 41386.00503 } } dps_results: { key: "TestGuardian-AllItems-MightoftheOcean-55251" value: { - dps: 7861.93121 - tps: 39376.25457 + dps: 8035.69804 + tps: 40242.28413 } } dps_results: { key: "TestGuardian-AllItems-MightoftheOcean-56285" value: { - dps: 8005.89017 - tps: 40096.48458 + dps: 8167.06716 + tps: 40899.5785 } } dps_results: { key: "TestGuardian-AllItems-MirrorofBrokenImages-62466" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-MirrorofBrokenImages-62471" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-MithrilStopwatch-71337" value: { - dps: 7622.04236 - tps: 38175.66703 + dps: 7883.45018 + tps: 39480.39256 } } dps_results: { key: "TestGuardian-AllItems-MoonwellChalice-70142" value: { - dps: 7521.82209 - tps: 37674.2363 + dps: 7812.79531 + tps: 39126.51635 } } dps_results: { key: "TestGuardian-AllItems-MoonwellPhial-70143" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-NecromanticFocus-68982" value: { - dps: 7521.82209 - tps: 37674.2363 + dps: 7812.79531 + tps: 39126.51635 } } dps_results: { key: "TestGuardian-AllItems-NecromanticFocus-69139" value: { - dps: 7521.82209 - tps: 37674.2363 + dps: 7812.79531 + tps: 39126.51635 } } dps_results: { key: "TestGuardian-AllItems-Oremantle'sFavor-61448" value: { - dps: 7705.35396 - tps: 38592.38876 + dps: 7919.56238 + tps: 39661.05501 } } dps_results: { key: "TestGuardian-AllItems-PetrifiedPickledEgg-71336" value: { - dps: 7521.82209 - tps: 37674.2363 + dps: 7812.79531 + tps: 39126.51635 } } dps_results: { key: "TestGuardian-AllItems-PetrifiedTwilightScale-54591" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-PhylacteryoftheNamelessLich-50365" value: { - dps: 7545.48871 - tps: 37792.69563 + dps: 7843.24252 + tps: 39278.88635 } } dps_results: { key: "TestGuardian-AllItems-PorcelainCrab-55237" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-PorcelainCrab-56280" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-PowerfulShadowspiritDiamond" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-Prestor'sTalismanofMachination-59441" value: { - dps: 7971.95331 - tps: 39925.38488 + dps: 8230.37742 + tps: 41215.46708 } } dps_results: { key: "TestGuardian-AllItems-Prestor'sTalismanofMachination-65026" value: { - dps: 7996.12266 - tps: 40047.24122 + dps: 8222.3043 + tps: 41175.65254 } } dps_results: { key: "TestGuardian-AllItems-Rainsong-55854" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-Rainsong-56377" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-ReverberatingShadowspiritDiamond" value: { - dps: 7693.5294 - tps: 38532.77035 + dps: 7940.45717 + tps: 39764.78982 } } dps_results: { key: "TestGuardian-AllItems-RevitalizingShadowspiritDiamond" value: { - dps: 7670.87789 - tps: 38419.5128 + dps: 7918.9823 + tps: 39657.41547 } } dps_results: { key: "TestGuardian-AllItems-Ricket'sMagneticFireball-70144" value: { - dps: 8072.43084 - tps: 40428.63565 + dps: 8261.22524 + tps: 41369.99598 } } dps_results: { key: "TestGuardian-AllItems-RightEyeofRajh-56100" value: { - dps: 7972.47549 - tps: 39929.61205 + dps: 8222.98456 + tps: 41178.78718 } } dps_results: { key: "TestGuardian-AllItems-RightEyeofRajh-56431" value: { - dps: 8011.5898 - tps: 40124.98277 + dps: 8170.5438 + tps: 40916.96173 } } dps_results: { key: "TestGuardian-AllItems-RuneofZeth-68998" value: { - dps: 7628.07943 - tps: 38268.77505 + dps: 7893.2923 + tps: 39588.99949 } } dps_results: { key: "TestGuardian-AllItems-Schnottz'sMedallionofCommand-65805" value: { - dps: 7776.17266 - tps: 38946.19453 + dps: 8065.63397 + tps: 40390.78672 } } dps_results: { key: "TestGuardian-AllItems-SeaStar-55256" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-SeaStar-56290" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-ShardofWoe-60233" value: { - dps: 7578.63202 - tps: 37959.23948 + dps: 7908.68594 + tps: 39607.0068 } } dps_results: { key: "TestGuardian-AllItems-Shrine-CleansingPurifier-63838" value: { - dps: 7705.50735 - tps: 38592.5586 + dps: 7951.52204 + tps: 39820.84334 } } dps_results: { key: "TestGuardian-AllItems-Sindragosa'sFlawlessFang-50364" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-Skardyn'sGrace-56115" value: { - dps: 7766.8925 - tps: 38899.65789 + dps: 8057.49492 + tps: 40350.21814 } } dps_results: { key: "TestGuardian-AllItems-Skardyn'sGrace-56440" value: { - dps: 7793.56925 - tps: 39032.89914 + dps: 8057.49404 + tps: 40350.27312 } } dps_results: { key: "TestGuardian-AllItems-Sorrowsong-55879" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-Sorrowsong-56400" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-Soul'sAnguish-66994" value: { - dps: 7914.62065 - tps: 39640.33785 + dps: 8167.65935 + tps: 40902.16111 } } dps_results: { key: "TestGuardian-AllItems-SoulCasket-58183" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-Stonemother'sKiss-61411" value: { - dps: 7579.79222 - tps: 37964.03192 + dps: 7842.6212 + tps: 39276.19414 } } dps_results: { key: "TestGuardian-AllItems-Stormrider'sBattlegarb" value: { - dps: 8290.97994 - tps: 41524.91865 + dps: 8530.27897 + tps: 42719.22444 } } dps_results: { key: "TestGuardian-AllItems-Stormrider'sRegalia" value: { - dps: 6087.70073 - tps: 30503.01699 + dps: 6301.19836 + tps: 31569.27932 } } dps_results: { key: "TestGuardian-AllItems-StumpofTime-62465" value: { - dps: 7880.88318 - tps: 39471.11133 + dps: 8109.65522 + tps: 40613.30589 } } dps_results: { key: "TestGuardian-AllItems-StumpofTime-62470" value: { - dps: 7880.88318 - tps: 39471.11133 + dps: 8109.65522 + tps: 40613.30589 } } dps_results: { key: "TestGuardian-AllItems-SymbioticWorm-59332" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-SymbioticWorm-65048" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-TalismanofSinisterOrder-65804" value: { - dps: 7537.14209 - tps: 37750.75047 + dps: 7810.92835 + tps: 39117.1707 } } dps_results: { key: "TestGuardian-AllItems-Tank-CommanderInsignia-63841" value: { - dps: 7646.55088 - tps: 38298.24108 + dps: 7898.37265 + tps: 39554.53803 } } dps_results: { key: "TestGuardian-AllItems-TearofBlood-55819" value: { - dps: 7537.14209 - tps: 37750.75047 + dps: 7810.92835 + tps: 39117.1707 } } dps_results: { key: "TestGuardian-AllItems-TearofBlood-56351" value: { - dps: 7521.82209 - tps: 37674.2363 + dps: 7810.92835 + tps: 39117.1707 } } dps_results: { key: "TestGuardian-AllItems-TendrilsofBurrowingDark-55810" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-TendrilsofBurrowingDark-56339" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-TheHungerer-68927" value: { - dps: 7966.60474 - tps: 39899.75453 + dps: 8292.48041 + tps: 41525.93499 } } dps_results: { key: "TestGuardian-AllItems-TheHungerer-69112" value: { - dps: 8073.84571 - tps: 40435.7271 + dps: 8334.8508 + tps: 41739.1859 } } dps_results: { key: "TestGuardian-AllItems-Theralion'sMirror-59519" value: { - dps: 7521.82209 - tps: 37674.2363 + dps: 7812.79531 + tps: 39126.51635 } } dps_results: { key: "TestGuardian-AllItems-Theralion'sMirror-65105" value: { - dps: 7521.82209 - tps: 37674.2363 + dps: 7812.79531 + tps: 39126.51635 } } dps_results: { key: "TestGuardian-AllItems-Throngus'sFinger-56121" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-Throngus'sFinger-56449" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-Tia'sGrace-55874" value: { - dps: 7795.55575 - tps: 39042.82335 + dps: 8062.18518 + tps: 40373.78569 } } dps_results: { key: "TestGuardian-AllItems-Tia'sGrace-56394" value: { - dps: 7839.9136 - tps: 39264.56633 + dps: 8111.34727 + tps: 40619.61947 } } dps_results: { key: "TestGuardian-AllItems-TinyAbominationinaJar-50706" value: { - dps: 7748.64494 - tps: 38808.87595 + dps: 7950.03102 + tps: 39813.69262 } } dps_results: { key: "TestGuardian-AllItems-Tyrande'sFavoriteDoll-64645" value: { - dps: 7497.4889 - tps: 37552.57388 + dps: 7787.25353 + tps: 38999.16368 } } dps_results: { key: "TestGuardian-AllItems-UnheededWarning-59520" value: { - dps: 7949.07737 - tps: 39810.49812 + dps: 8262.97446 + tps: 41377.74269 } } dps_results: { key: "TestGuardian-AllItems-UnquenchableFlame-67101" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-UnsolvableRiddle-62463" value: { - dps: 7938.81714 - tps: 39759.61676 + dps: 8132.40501 + tps: 40725.01565 } } dps_results: { key: "TestGuardian-AllItems-UnsolvableRiddle-62468" value: { - dps: 7938.81714 - tps: 39759.61676 + dps: 8132.40501 + tps: 40725.01565 } } dps_results: { key: "TestGuardian-AllItems-UnsolvableRiddle-68709" value: { - dps: 7938.81714 - tps: 39759.61676 + dps: 8132.40501 + tps: 40725.01565 } } dps_results: { key: "TestGuardian-AllItems-Val'anyr,HammerofAncientKings-46017" value: { - dps: 6439.7789 - tps: 32262.71365 + dps: 6554.5283 + tps: 32834.06982 } } dps_results: { key: "TestGuardian-AllItems-VariablePulseLightningCapacitor-68925" value: { - dps: 7502.22428 - tps: 37576.49851 + dps: 7733.56645 + tps: 38730.31535 } } dps_results: { key: "TestGuardian-AllItems-VariablePulseLightningCapacitor-69110" value: { - dps: 7606.1776 - tps: 38096.12593 + dps: 7836.8759 + tps: 39246.48344 } } dps_results: { key: "TestGuardian-AllItems-VesselofAcceleration-68995" value: { - dps: 7787.874 - tps: 39005.12915 + dps: 8050.66126 + tps: 40316.60173 } } dps_results: { key: "TestGuardian-AllItems-VesselofAcceleration-69167" value: { - dps: 7812.50473 - tps: 39128.66116 + dps: 8160.79956 + tps: 40867.5328 } } dps_results: { key: "TestGuardian-AllItems-VialofStolenMemories-59515" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-VialofStolenMemories-65109" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-ViciousGladiator'sBadgeofConquest-61033" value: { - dps: 7938.81714 - tps: 39759.61676 + dps: 8132.40501 + tps: 40725.01565 } } dps_results: { key: "TestGuardian-AllItems-ViciousGladiator'sBadgeofDominance-61035" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-ViciousGladiator'sBadgeofVictory-61034" value: { - dps: 7711.63805 - tps: 38623.31361 + dps: 7961.44329 + tps: 39869.72042 } } dps_results: { key: "TestGuardian-AllItems-ViciousGladiator'sEmblemofAccuracy-61027" value: { - dps: 7850.8522 - tps: 39321.38456 + dps: 8116.5732 + tps: 40647.90268 } } dps_results: { key: "TestGuardian-AllItems-ViciousGladiator'sEmblemofAlacrity-61028" value: { - dps: 7604.78043 - tps: 38089.78819 + dps: 7927.37038 + tps: 39700.46854 } } dps_results: { key: "TestGuardian-AllItems-ViciousGladiator'sEmblemofCruelty-61026" value: { - dps: 7622.04236 - tps: 38175.66703 + dps: 7883.45018 + tps: 39480.39256 } } dps_results: { key: "TestGuardian-AllItems-ViciousGladiator'sEmblemofProficiency-61030" value: { - dps: 8014.54108 - tps: 40138.47831 + dps: 8249.87942 + tps: 41312.31211 } } dps_results: { key: "TestGuardian-AllItems-ViciousGladiator'sEmblemofProwess-61029" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-ViciousGladiator'sEmblemofTenacity-61032" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-ViciousGladiator'sInsigniaofConquest-61047" value: { - dps: 7939.46588 - tps: 39762.54963 + dps: 8137.20396 + tps: 40748.23294 } } dps_results: { key: "TestGuardian-AllItems-ViciousGladiator'sInsigniaofDominance-61045" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-ViciousGladiator'sInsigniaofVictory-61046" value: { - dps: 7694.84985 - tps: 38539.37259 + dps: 7947.7195 + tps: 39801.10145 } } dps_results: { key: "TestGuardian-AllItems-WitchingHourglass-55787" value: { - dps: 7558.80504 - tps: 37859.14602 + dps: 7861.86451 + tps: 39372.36818 } } dps_results: { key: "TestGuardian-AllItems-WitchingHourglass-56320" value: { - dps: 7597.27275 - tps: 38051.61479 + dps: 7774.67953 + tps: 38936.71121 } } dps_results: { key: "TestGuardian-AllItems-World-QuellerFocus-63842" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-Za'brox'sLuckyTooth-63742" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-AllItems-Za'brox'sLuckyTooth-63745" value: { - dps: 7551.55167 - tps: 37822.88171 + dps: 7809.85545 + tps: 39111.78118 } } dps_results: { key: "TestGuardian-Average-Default" value: { - dps: 12764.65652 - tps: 63902.35221 - dtps: 6471.52237 + dps: 12737.14414 + tps: 63763.44676 + dtps: 6117.26228 } } dps_results: { key: "TestGuardian-Settings-Tauren-p1-Default-default-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 24721.84931 - tps: 124406.35905 + dps: 23664.56986 + tps: 119053.02515 } } dps_results: { key: "TestGuardian-Settings-Tauren-p1-Default-default-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 10271.69204 - tps: 51428.68394 + dps: 10041.66299 + tps: 50277.0241 } } dps_results: { key: "TestGuardian-Settings-Tauren-p1-Default-default-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 11781.28408 - tps: 58983.24331 + dps: 11527.59103 + tps: 57713.89266 } } dps_results: { key: "TestGuardian-Settings-Tauren-p1-Default-default-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 16947.60085 - tps: 85921.75508 + dps: 16217.79779 + tps: 82199.6831 } } dps_results: { key: "TestGuardian-Settings-Tauren-p1-Default-default-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 6943.56222 - tps: 34794.66777 + dps: 6797.32429 + tps: 34062.74229 } } dps_results: { key: "TestGuardian-Settings-Tauren-p1-Default-default-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 6839.96878 - tps: 34284.42725 + dps: 6807.83579 + tps: 34121.36646 } } dps_results: { key: "TestGuardian-Settings-Tauren-preraid-Default-default-FullBuffs-0.0yards-LongMultiTarget" value: { - dps: 21449.62867 - tps: 107978.63835 + dps: 21528.85037 + tps: 108278.57519 } } dps_results: { key: "TestGuardian-Settings-Tauren-preraid-Default-default-FullBuffs-0.0yards-LongSingleTarget" value: { - dps: 8878.75912 - tps: 44462.08916 + dps: 9189.59907 + tps: 46012.94701 } } dps_results: { key: "TestGuardian-Settings-Tauren-preraid-Default-default-FullBuffs-0.0yards-ShortSingleTarget" value: { - dps: 10055.85717 - tps: 50352.8869 + dps: 10409.99949 + tps: 52120.63914 } } dps_results: { key: "TestGuardian-Settings-Tauren-preraid-Default-default-NoBuffs-0.0yards-LongMultiTarget" value: { - dps: 14343.43893 - tps: 72816.56132 + dps: 14302.38848 + tps: 72511.56655 } } dps_results: { key: "TestGuardian-Settings-Tauren-preraid-Default-default-NoBuffs-0.0yards-LongSingleTarget" value: { - dps: 5856.67038 - tps: 29358.48358 + dps: 6147.68858 + tps: 30812.24288 } } dps_results: { key: "TestGuardian-Settings-Tauren-preraid-Default-default-NoBuffs-0.0yards-ShortSingleTarget" value: { - dps: 5822.5129 - tps: 29194.98118 + dps: 5993.88973 + tps: 30051.60281 } } dps_results: { key: "TestGuardian-SwitchInFrontOfTarget-Default" value: { - dps: 14444.88139 - tps: 72310.85281 - dtps: 5825.96244 + dps: 14363.69744 + tps: 71902.49649 + dtps: 5432.96711 } } diff --git a/ui/core/launched_sims.ts b/ui/core/launched_sims.ts index 842732923b..8d03288c1a 100644 --- a/ui/core/launched_sims.ts +++ b/ui/core/launched_sims.ts @@ -51,8 +51,8 @@ export const simLaunchStatuses: Record = { status: LaunchStatus.Launched, }, [Spec.SpecGuardianDruid]: { - phase: Phase.Phase1, - status: LaunchStatus.Beta, + phase: Phase.Phase2, + status: LaunchStatus.Launched, }, [Spec.SpecRestorationDruid]: { phase: Phase.Phase1, diff --git a/ui/druid/guardian/apls/cleave.apl.json b/ui/druid/guardian/apls/cleave.apl.json new file mode 100644 index 0000000000..edfca3c6de --- /dev/null +++ b/ui/druid/guardian/apls/cleave.apl.json @@ -0,0 +1,38 @@ +{ + "type": "TypeAPL", + "simple": { + "cooldowns": { + "cooldowns": [ + ], + "hpPercentForDefensives": 0.5 + } + }, + "prepullActions": [ + {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-1s"}}}, + {"action":{"activateAura":{"auraId":{"spellId":81017}}},"doAtValue":{"const":{"val":"-0.1s"}}} + ], + "priorityList": [ + {"action":{"autocastOtherCooldowns":{}}}, + {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"currentHealthPercent":{}},"rhs":{"const":{"val":"30%"}}}},"castSpell":{"spellId":{"spellId":22842}}}}, + {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"currentHealthPercent":{}},"rhs":{"const":{"val":"40%"}}}},"castSpell":{"spellId":{"spellId":61336}}}}, + {"action":{"condition":{"and":{"vals":[{"dotIsActive":{"targetUnit":{"type":"Target"},"spellId":{"spellId":33745}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"Target"},"auraId":{"spellId":33745}}},"rhs":{"const":{"val":"3"}}}},{"cmp":{"op":"OpLe","lhs":{"dotRemainingTime":{"targetUnit":{"type":"Target"},"spellId":{"spellId":33745}}},"rhs":{"const":{"val":"4s"}}}}]}},"castSpell":{"spellId":{"spellId":80313},"target":{"type":"Target"}}}}, + {"action":{"condition":{"and":{"vals":[{"dotIsActive":{"targetUnit":{"type":"Target"},"spellId":{"spellId":33745}}},{"cmp":{"op":"OpLe","lhs":{"dotRemainingTime":{"targetUnit":{"type":"Target"},"spellId":{"spellId":33745}}},"rhs":{"const":{"val":"4s"}}}}]}},"castSpell":{"spellId":{"spellId":33745},"target":{"type":"Target"}}}}, + {"action":{"condition":{"and":{"vals":[{"dotIsActive":{"targetUnit":{"type":"Target","index":1},"spellId":{"spellId":33745}}},{"cmp":{"op":"OpLe","lhs":{"dotRemainingTime":{"targetUnit":{"type":"Target","index":1},"spellId":{"spellId":33745}}},"rhs":{"const":{"val":"4s"}}}}]}},"castSpell":{"spellId":{"spellId":33745},"target":{"type":"Target","index":1}}}}, + {"action":{"condition":{"or":{"vals":[{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"Target"},"auraId":{"spellId":770}}}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"Target"},"auraId":{"spellId":770}}},"rhs":{"const":{"val":"6s"}}}}]}},"castSpell":{"spellId":{"spellId":16857},"target":{"type":"Target"}}}}, + {"action":{"condition":{"or":{"vals":[{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"Target","index":1},"auraId":{"spellId":770}}}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"Target","index":1},"auraId":{"spellId":770}}},"rhs":{"const":{"val":"6s"}}}}]}},"castSpell":{"spellId":{"spellId":16857},"target":{"type":"Target","index":1}}}}, + {"action":{"condition":{"auraShouldRefresh":{"sourceUnit":{"type":"Target"},"auraId":{"spellId":99},"maxOverlap":{"const":{"val":"4s"}}}},"castSpell":{"spellId":{"spellId":99},"target":{"type":"Target"}}}}, + {"action":{"castSpell":{"spellId":{"spellId":50334}}}}, + {"action":{"castSpell":{"spellId":{"spellId":5229}}}}, + {"action":{"castSpell":{"spellId":{"spellId":82174}}}}, + {"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":50334}}}}},"castSpell":{"spellId":{"spellId":77758},"target":{"type":"Target"}}}}, + {"action":{"castSpell":{"spellId":{"spellId":33878},"target":{"type":"Target"}}}}, + {"action":{"condition":{"and":{"vals":[{"not":{"val":{"dotIsActive":{"targetUnit":{"type":"Target"},"spellId":{"spellId":33745}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":50334}}}}}]}},"castSpell":{"spellId":{"spellId":33745},"target":{"type":"Target"}}}}, + {"action":{"condition":{"and":{"vals":[{"not":{"val":{"dotIsActive":{"targetUnit":{"type":"Target","index":1},"spellId":{"spellId":33745}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":50334}}}}}]}},"castSpell":{"spellId":{"spellId":33745},"target":{"type":"Target","index":1}}}}, + {"action":{"condition":{"and":{"vals":[{"dotIsActive":{"targetUnit":{"type":"Target"},"spellId":{"spellId":33745}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"Target"},"auraId":{"spellId":33745}}},"rhs":{"const":{"val":"3"}}}},{"or":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":80951}}}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":80951}}},"rhs":{"const":{"val":"4s"}}}}]}}]}},"castSpell":{"spellId":{"spellId":80313},"target":{"type":"Target"}}}}, + {"action":{"condition":{"and":{"vals":[{"dotIsActive":{"targetUnit":{"type":"Target","index":1},"spellId":{"spellId":33745}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"Target","index":1},"auraId":{"spellId":33745}}},"rhs":{"const":{"val":"3"}}}},{"or":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":80951}}}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":80951}}},"rhs":{"const":{"val":"4s"}}}}]}}]}},"castSpell":{"spellId":{"spellId":80313},"target":{"type":"Target","index":1}}}}, + {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"sourceUnit":{"type":"Target"},"auraId":{"spellId":33745}}},"rhs":{"const":{"val":"3"}}}},"castSpell":{"spellId":{"spellId":33745},"target":{"type":"Target"}}}}, + {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"sourceUnit":{"type":"Target","index":1},"auraId":{"spellId":33745}}},"rhs":{"const":{"val":"3"}}}},"castSpell":{"spellId":{"spellId":33745},"target":{"type":"Target","index":1}}}}, + {"action":{"castSpell":{"spellId":{"spellId":16857},"target":{"type":"Target"}}}}, + {"action":{"castSpell":{"spellId":{"spellId":6807},"target":{"type":"Target"}}}} + ] +} diff --git a/ui/druid/guardian/apls/default.apl.json b/ui/druid/guardian/apls/default.apl.json index e38c5d46b7..11bef59695 100644 --- a/ui/druid/guardian/apls/default.apl.json +++ b/ui/druid/guardian/apls/default.apl.json @@ -15,18 +15,18 @@ {"action":{"autocastOtherCooldowns":{}}}, {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"currentHealthPercent":{}},"rhs":{"const":{"val":"30%"}}}},"castSpell":{"spellId":{"spellId":22842}}}}, {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"currentHealthPercent":{}},"rhs":{"const":{"val":"40%"}}}},"castSpell":{"spellId":{"spellId":61336}}}}, - {"action":{"condition":{"and":{"vals":[{"dotIsActive":{"spellId":{"spellId":33745}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":33745}}},"rhs":{"const":{"val":"3"}}}},{"cmp":{"op":"OpLe","lhs":{"dotRemainingTime":{"spellId":{"spellId":33745}}},"rhs":{"const":{"val":"4s"}}}}]}},"castSpell":{"spellId":{"spellId":80313}}}}, - {"action":{"condition":{"or":{"vals":[{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":770}}}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":770}}},"rhs":{"const":{"val":"6s"}}}}]}},"castSpell":{"spellId":{"spellId":16857}}}}, - {"action":{"condition":{"auraShouldRefresh":{"auraId":{"spellId":99},"maxOverlap":{"const":{"val":"4s"}}}},"castSpell":{"spellId":{"spellId":99}}}}, + {"action":{"condition":{"and":{"vals":[{"dotIsActive":{"targetUnit":{"type":"Target"},"spellId":{"spellId":33745}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"Target"},"auraId":{"spellId":33745}}},"rhs":{"const":{"val":"3"}}}},{"cmp":{"op":"OpLe","lhs":{"dotRemainingTime":{"targetUnit":{"type":"Target"},"spellId":{"spellId":33745}}},"rhs":{"const":{"val":"4s"}}}}]}},"castSpell":{"spellId":{"spellId":80313},"target":{"type":"Target"}}}}, + {"action":{"condition":{"or":{"vals":[{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"Target"},"auraId":{"spellId":770}}}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"Target"},"auraId":{"spellId":770}}},"rhs":{"const":{"val":"6s"}}}}]}},"castSpell":{"spellId":{"spellId":16857},"target":{"type":"Target"}}}}, + {"action":{"condition":{"auraShouldRefresh":{"sourceUnit":{"type":"Target"},"auraId":{"spellId":99},"maxOverlap":{"const":{"val":"4s"}}}},"castSpell":{"spellId":{"spellId":99},"target":{"type":"Target"}}}}, {"action":{"castSpell":{"spellId":{"spellId":50334}}}}, {"action":{"castSpell":{"spellId":{"spellId":5229}}}}, {"action":{"castSpell":{"spellId":{"spellId":82174}}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"dotIsActive":{"spellId":{"spellId":33745}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":50334}}}}}]}},"castSpell":{"spellId":{"spellId":33745}}}}, - {"action":{"castSpell":{"spellId":{"spellId":33878}}}}, - {"action":{"castSpell":{"spellId":{"spellId":77758}}}}, - {"action":{"castSpell":{"spellId":{"spellId":16857}}}}, - {"action":{"condition":{"and":{"vals":[{"dotIsActive":{"spellId":{"spellId":33745}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":33745}}},"rhs":{"const":{"val":"3"}}}},{"or":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":80951}}}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":80951}}},"rhs":{"const":{"val":"4s"}}}}]}}]}},"castSpell":{"spellId":{"spellId":80313}}}}, - {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":33745}}},"rhs":{"const":{"val":"3"}}}},"castSpell":{"spellId":{"spellId":33745}}}}, - {"action":{"castSpell":{"spellId":{"spellId":6807}}}} + {"action":{"condition":{"and":{"vals":[{"not":{"val":{"dotIsActive":{"targetUnit":{"type":"Target"},"spellId":{"spellId":33745}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":50334}}}}}]}},"castSpell":{"spellId":{"spellId":33745},"target":{"type":"Target"}}}}, + {"action":{"castSpell":{"spellId":{"spellId":33878},"target":{"type":"Target"}}}}, + {"action":{"castSpell":{"spellId":{"spellId":77758},"target":{"type":"Target"}}}}, + {"action":{"castSpell":{"spellId":{"spellId":16857},"target":{"type":"Target"}}}}, + {"action":{"condition":{"and":{"vals":[{"dotIsActive":{"targetUnit":{"type":"Target"},"spellId":{"spellId":33745}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"Target"},"auraId":{"spellId":33745}}},"rhs":{"const":{"val":"3"}}}},{"or":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":80951}}}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":80951}}},"rhs":{"const":{"val":"4s"}}}}]}}]}},"castSpell":{"spellId":{"spellId":80313},"target":{"type":"Target"}}}}, + {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"sourceUnit":{"type":"Target"},"auraId":{"spellId":33745}}},"rhs":{"const":{"val":"3"}}}},"castSpell":{"spellId":{"spellId":33745},"target":{"type":"Target"}}}}, + {"action":{"castSpell":{"spellId":{"spellId":6807},"target":{"type":"Target"}}}} ] } diff --git a/ui/druid/guardian/apls/nef.apl.json b/ui/druid/guardian/apls/nef.apl.json new file mode 100644 index 0000000000..2a74398eec --- /dev/null +++ b/ui/druid/guardian/apls/nef.apl.json @@ -0,0 +1,37 @@ +{ + "type": "TypeAPL", + "simple": { + "cooldowns": { + "hpPercentForDefensives": 0.5 + } + }, + "prepullActions": [ + {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-1s"}}} + ], + "priorityList": [ + {"action":{"autocastOtherCooldowns":{}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"bossSpellTimeToReady":{"spellId":{"spellId":81272}}},"rhs":{"const":{"val":"1.5s"}}}},{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":79330}}},"rhs":{"const":{"val":"7"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":61336}}}}}]}},"castSpell":{"spellId":{"itemId":62471}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"bossSpellTimeToReady":{"spellId":{"spellId":81272}}},"rhs":{"const":{"val":"1.5s"}}}},{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":79330}}},"rhs":{"const":{"val":"8"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":61336}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"itemId":62471}}}}}]}},"castSpell":{"spellId":{"spellId":22842}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"bossSpellTimeToReady":{"spellId":{"spellId":81272}}},"rhs":{"const":{"val":"1.5s"}}}},{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":79330}}},"rhs":{"const":{"val":"8"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":22842}}}}}]}},"castSpell":{"spellId":{"itemId":56370}}}}, + {"action":{"condition":{"and":{"vals":[{"or":{"vals":[{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":79330}}},"rhs":{"const":{"val":"11"}}}},{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"bossSpellTimeToReady":{"spellId":{"spellId":81272}}},"rhs":{"const":{"val":"1.5s"}}}},{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":79330}}},"rhs":{"const":{"val":"10"}}}}]}}]}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":22842}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"itemId":56370}}}}}]}},"castSpell":{"spellId":{"spellId":61336}}}}, + {"action":{"condition":{"and":{"vals":[{"or":{"vals":[{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":79330}}},"rhs":{"const":{"val":"11"}}}},{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"bossSpellTimeToReady":{"spellId":{"spellId":81272}}},"rhs":{"const":{"val":"1.5s"}}}},{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":79330}}},"rhs":{"const":{"val":"10"}}}}]}}]}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":61336}}}}}]}},"castSpell":{"spellId":{"spellId":22812}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":79330}}},"rhs":{"const":{"val":"11"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":61336}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":22812}}}}}]}},"castSpell":{"spellId":{"spellId":33206,"tag":-1}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":79330}}},"rhs":{"const":{"val":"11"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":61336}}}}},{"or":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":22812}}}}},{"cmp":{"op":"OpLt","lhs":{"currentHealthPercent":{}},"rhs":{"const":{"val":"40%"}}}}]}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":33206,"tag":-1}}}}}]}},"castSpell":{"spellId":{"itemId":56370}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":79330}}},"rhs":{"const":{"val":"11"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":61336}}}}},{"or":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":22812}}}}},{"cmp":{"op":"OpLt","lhs":{"currentHealthPercent":{}},"rhs":{"const":{"val":"30%"}}}}]}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":33206,"tag":-1}}}}}]}},"castSpell":{"spellId":{"spellId":22842}}}}, + {"action":{"condition":{"and":{"vals":[{"dotIsActive":{"spellId":{"spellId":33745}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":33745}}},"rhs":{"const":{"val":"3"}}}},{"cmp":{"op":"OpLe","lhs":{"dotRemainingTime":{"spellId":{"spellId":33745}}},"rhs":{"const":{"val":"4s"}}}}]}},"castSpell":{"spellId":{"spellId":80313}}}}, + {"action":{"condition":{"or":{"vals":[{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":770}}}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":770}}},"rhs":{"const":{"val":"6s"}}}}]}},"castSpell":{"spellId":{"spellId":16857}}}}, + {"action":{"condition":{"auraShouldRefresh":{"auraId":{"spellId":99},"maxOverlap":{"const":{"val":"4s"}}}},"castSpell":{"spellId":{"spellId":99}}}}, + {"action":{"castSpell":{"spellId":{"spellId":77758}}}}, + {"action":{"castSpell":{"spellId":{"spellId":779}}}}, + {"action":{"castSpell":{"spellId":{"spellId":50334}}}}, + {"action":{"castSpell":{"spellId":{"spellId":5229}}}}, + {"action":{"castSpell":{"spellId":{"spellId":82174}}}}, + {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}}}, + {"action":{"condition":{"and":{"vals":[{"not":{"val":{"dotIsActive":{"spellId":{"spellId":33745}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":50334}}}}}]}},"castSpell":{"spellId":{"spellId":33745}}}}, + {"action":{"castSpell":{"spellId":{"spellId":33878}}}}, + {"action":{"castSpell":{"spellId":{"spellId":16857}}}}, + {"action":{"condition":{"and":{"vals":[{"dotIsActive":{"spellId":{"spellId":33745}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":33745}}},"rhs":{"const":{"val":"3"}}}},{"or":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":80951}}}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":80951}}},"rhs":{"const":{"val":"4s"}}}}]}}]}},"castSpell":{"spellId":{"spellId":80313}}}}, + {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":33745}}},"rhs":{"const":{"val":"3"}}}},"castSpell":{"spellId":{"spellId":33745}}}}, + {"action":{"castSpell":{"spellId":{"spellId":6807}}}} + ] +} diff --git a/ui/druid/guardian/gear_sets/p1.gear.json b/ui/druid/guardian/gear_sets/p1.gear.json index 00a5889b8a..a4eb03f02c 100644 --- a/ui/druid/guardian/gear_sets/p1.gear.json +++ b/ui/druid/guardian/gear_sets/p1.gear.json @@ -1,19 +1,19 @@ {"items": [ - {"id":65190,"enchant":4206,"gems":[52294,52242],"reforging":135}, - {"id":69880,"randomSuffix":-137,"reforging":163}, - {"id":65083,"enchant":4198,"gems":[52242],"reforging":163}, - {"id":65035,"enchant":4090,"reforging":163}, - {"id":65060,"enchant":4103,"gems":[52242,52242],"reforging":163}, - {"id":65050,"enchant":3850,"gems":[0],"reforging":163}, - {"id":65073,"enchant":3260,"gems":[52242,0],"reforging":163}, - {"id":60231,"gems":[52242,52242,52242],"reforging":163}, - {"id":65191,"enchant":4127,"gems":[52233,52242],"reforging":163}, + {"id":65190,"enchant":4206,"gems":[52294,52242],"reforging":142}, + {"id":69880,"randomSuffix":-137,"reforging":142}, + {"id":65083,"enchant":4198,"gems":[52242],"reforging":142}, + {"id":65035,"enchant":4090,"reforging":142}, + {"id":65060,"enchant":4103,"gems":[52242,52242],"reforging":142}, + {"id":65050,"enchant":4258,"gems":[0],"reforging":142}, + {"id":65073,"enchant":3260,"gems":[52242,0],"reforging":156}, + {"id":60231,"gems":[52242,52238,52242],"reforging":142}, + {"id":65191,"enchant":4127,"gems":[52233,52242],"reforging":142}, {"id":65144,"enchant":4062,"gems":[52233],"reforging":149}, - {"id":65367,"randomSuffix":-137,"reforging":163}, - {"id":65082,"reforging":135}, + {"id":65367,"randomSuffix":-137,"reforging":142}, + {"id":65082,"reforging":142}, {"id":65048}, {"id":65109}, - {"id":65139,"enchant":4098,"reforging":163}, + {"id":65139,"enchant":4098,"reforging":142}, {}, {"id":64671,"gems":[52242],"reforging":149} ]} diff --git a/ui/druid/guardian/gear_sets/preraid.gear.json b/ui/druid/guardian/gear_sets/preraid.gear.json index b4052f0e7c..e9c85dce20 100644 --- a/ui/druid/guardian/gear_sets/preraid.gear.json +++ b/ui/druid/guardian/gear_sets/preraid.gear.json @@ -1,19 +1,19 @@ {"items": [ - {"id":59455,"enchant":4206,"gems":[52294,59477,59478]}, - {"id":52350,"gems":[52242],"reforging":149}, - {"id":64731,"enchant":4198,"gems":[52233],"reforging":156}, - {"id":58191,"enchant":4090,"reforging":135}, - {"id":67135,"enchant":4103,"gems":[52242,52242],"reforging":163}, - {"id":63454,"enchant":3850,"gems":[0],"reforging":163}, - {"id":62433,"enchant":3260,"gems":[52242,0],"reforging":149}, - {"id":56537,"gems":[52242,52242],"reforging":135}, - {"id":60288,"enchant":4127,"gems":[52233,52242],"reforging":163}, - {"id":58482,"enchant":4062,"gems":[52242],"reforging":149}, - {"id":52348,"gems":[52242],"reforging":163}, - {"id":52348,"gems":[52242],"reforging":163}, + {"id":59455,"enchant":4206,"gems":[52294,59477,59480]}, + {"id":60668,"reforging":163}, + {"id":60447,"enchant":4198,"gems":[52233],"reforging":156}, + {"id":60779,"enchant":4090,"reforging":163}, + {"id":60446,"enchant":4103,"gems":[52242,52242],"reforging":142}, + {"id":60591,"enchant":4258,"gems":[0],"reforging":135}, + {"id":60443,"enchant":3260,"gems":[52242,0],"reforging":142}, + {"id":60589,"gems":[52242,52242],"reforging":135}, + {"id":60445,"enchant":4127,"gems":[52242,52242],"reforging":149}, + {"id":60587,"enchant":4062,"gems":[52233],"reforging":142}, + {"id":62362,"reforging":149}, + {"id":68812,"reforging":149}, {"id":56347}, - {"id":56370}, - {"id":55066,"enchant":4098,"reforging":163}, + {"id":58182}, + {"id":69843,"enchant":4098,"reforging":149}, {}, {"id":64671,"gems":[52242],"reforging":149} ]} diff --git a/ui/druid/guardian/presets.ts b/ui/druid/guardian/presets.ts index ec86941c73..ed7c4fb74b 100644 --- a/ui/druid/guardian/presets.ts +++ b/ui/druid/guardian/presets.ts @@ -13,9 +13,9 @@ import { SavedTalents } from '../../core/proto/ui.js'; // Eventually we will import these values for the raid sim too, so its good to // keep them in a separate file. import PreraidGear from './gear_sets/preraid.gear.json'; -export const PRERAID_PRESET = PresetUtils.makePresetGear('Preraid Preset', PreraidGear); +export const PRERAID_PRESET = PresetUtils.makePresetGear('Pre-Raid BiS', PreraidGear); import P1Gear from './gear_sets/p1.gear.json'; -export const P1_PRESET = PresetUtils.makePresetGear('P1', P1Gear); +export const P1_PRESET = PresetUtils.makePresetGear('P1/P2 BiS', P1Gear); import P2Gear from './gear_sets/p2.gear.json'; export const P2_PRESET = PresetUtils.makePresetGear('P2', P2Gear); import P3Gear from './gear_sets/p3.gear.json'; @@ -33,7 +33,11 @@ export const DefaultSimpleRotation = DruidRotation.create({ import { Stats } from '../../core/proto_utils/stats'; import DefaultApl from './apls/default.apl.json'; +import CleaveApl from './apls/cleave.apl.json'; +import NefApl from './apls/nef.apl.json'; export const ROTATION_DEFAULT = PresetUtils.makePresetAPLRotation('APL Default', DefaultApl); +export const ROTATION_CLEAVE = PresetUtils.makePresetAPLRotation('2-Target Cleave', CleaveApl); +export const ROTATION_NEF = PresetUtils.makePresetAPLRotation('AoE (Nef Adds)', NefApl); export const ROTATION_PRESET_SIMPLE = PresetUtils.makePresetSimpleRotation('Simple Default', Spec.SpecGuardianDruid, DefaultSimpleRotation); @@ -121,3 +125,7 @@ export const DefaultConsumes = Consumes.create({ defaultConjured: Conjured.ConjuredHealthstone, tinkerHands: TinkerHands.TinkerHandsSynapseSprings, }); + +export const OtherDefaults = { + iterationCount: 50000, +}; diff --git a/ui/druid/guardian/sim.ts b/ui/druid/guardian/sim.ts index c9d5f920ad..0d0e1d8a52 100644 --- a/ui/druid/guardian/sim.ts +++ b/ui/druid/guardian/sim.ts @@ -89,6 +89,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecGuardianDruid, { return [expertiseSoftCapConfig, hitSoftCapConfig]; })(), + other: Presets.OtherDefaults, // Default consumes settings. consumes: Presets.DefaultConsumes, // Default rotation settings. @@ -151,7 +152,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecGuardianDruid, { // Preset talents that the user can quickly select. talents: [Presets.StandardTalents], // Preset rotations that the user can quickly select. - rotations: [Presets.ROTATION_PRESET_SIMPLE, Presets.ROTATION_DEFAULT], + rotations: [Presets.ROTATION_PRESET_SIMPLE, Presets.ROTATION_DEFAULT, Presets.ROTATION_CLEAVE, Presets.ROTATION_NEF], // Preset gear configurations that the user can quickly select. gear: [Presets.PRERAID_PRESET, Presets.P1_PRESET], }, @@ -170,36 +171,36 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecGuardianDruid, { const emergencySpellId = player.getTalents().pulverize ? 80313 : 33745; const emergencyPulverize = APLAction.fromJsonString( - `{"condition":{"and":{"vals":[{"dotIsActive":{"spellId":{"spellId":33745}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":33745}}},"rhs":{"const":{"val":"3"}}}},{"cmp":{"op":"OpLe","lhs":{"dotRemainingTime":{"spellId":{"spellId":33745}}},"rhs":{"const":{"val":"${simple.pulverizeTime.toFixed( + `{"condition":{"and":{"vals":[{"dotIsActive":{"targetUnit":{"type":"Target"},"spellId":{"spellId":33745}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"Target"},"auraId":{"spellId":33745}}},"rhs":{"const":{"val":"3"}}}},{"cmp":{"op":"OpLe","lhs":{"dotRemainingTime":{"targetUnit":{"type":"Target"},"spellId":{"spellId":33745}}},"rhs":{"const":{"val":"${simple.pulverizeTime.toFixed( 1, - )}s"}}}}]}},"castSpell":{"spellId":{"spellId":${emergencySpellId.toFixed(0)}}}}`, + )}s"}}}}]}},"castSpell":{"spellId":{"spellId":${emergencySpellId.toFixed(0)}},"target":{"type":"Target"}}}`, ); const faerieFireMaintain = APLAction.fromJsonString( - `{"condition":{"or":{"vals":[{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":770}}}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":770}}},"rhs":{"const":{"val":"6s"}}}}]}},"castSpell":{"spellId":{"spellId":16857}}}`, + `{"condition":{"or":{"vals":[{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"Target"},"auraId":{"spellId":770}}}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"Target"},"auraId":{"spellId":770}}},"rhs":{"const":{"val":"6s"}}}}]}},"castSpell":{"spellId":{"spellId":16857},"target":{"type":"Target"}}}`, ); const demoRoar = APLAction.fromJsonString( - `{"condition":{"auraShouldRefresh":{"auraId":{"spellId":99},"maxOverlap":{"const":{"val":"${simple.demoTime.toFixed( + `{"condition":{"auraShouldRefresh":{"sourceUnit":{"type":"Target"},"auraId":{"spellId":99},"maxOverlap":{"const":{"val":"${simple.demoTime.toFixed( 1, - )}s"}}}},"castSpell":{"spellId":{"spellId":99}}}`, + )}s"}}}},"castSpell":{"spellId":{"spellId":99},"target":{"type":"Target"}}}`, ); const berserk = APLAction.fromJsonString(`{"castSpell":{"spellId":{"spellId":50334}}}`); const enrage = APLAction.fromJsonString(`{"castSpell":{"spellId":{"spellId":5229}}}`); const synapseSprings = APLAction.fromJsonString(`{"castSpell":{"spellId":{"spellId":82174}}}`); const lacerateForProcs = APLAction.fromJsonString( - `{"condition":{"and":{"vals":[{"not":{"val":{"dotIsActive":{"spellId":{"spellId":33745}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":50334}}}}}]}},"castSpell":{"spellId":{"spellId":33745}}}`, + `{"condition":{"and":{"vals":[{"not":{"val":{"dotIsActive":{"targetUnit":{"type":"Target"},"spellId":{"spellId":33745}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":50334}}}}}]}},"castSpell":{"spellId":{"spellId":33745},"target":{"type":"Target"}}}`, ); - const mangle = APLAction.fromJsonString(`{"castSpell":{"spellId":{"spellId":33878}}}`); - const thrash = APLAction.fromJsonString(`{"castSpell":{"spellId":{"spellId":77758}}}`); - const faerieFireFiller = APLAction.fromJsonString(`{"castSpell":{"spellId":{"spellId":16857}}}`); + const mangle = APLAction.fromJsonString(`{"castSpell":{"spellId":{"spellId":33878},"target":{"type":"Target"}}}`); + const thrash = APLAction.fromJsonString(`{"castSpell":{"spellId":{"spellId":77758},"target":{"type":"Target"}}}`); + const faerieFireFiller = APLAction.fromJsonString(`{"castSpell":{"spellId":{"spellId":16857},"target":{"type":"Target"}}}`); const pulverize = APLAction.fromJsonString( - `{"condition":{"and":{"vals":[{"dotIsActive":{"spellId":{"spellId":33745}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":33745}}},"rhs":{"const":{"val":"3"}}}},{"or":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":80951}}}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":80951}}},"rhs":{"const":{"val":"${simple.pulverizeTime.toFixed( + `{"condition":{"and":{"vals":[{"dotIsActive":{"targetUnit":{"type":"Target"},"spellId":{"spellId":33745}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"Target"},"auraId":{"spellId":33745}}},"rhs":{"const":{"val":"3"}}}},{"or":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":80951}}}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":80951}}},"rhs":{"const":{"val":"${simple.pulverizeTime.toFixed( 1, - )}s"}}}}]}}]}},"castSpell":{"spellId":{"spellId":80313}}}`, + )}s"}}}}]}}]}},"castSpell":{"spellId":{"spellId":80313},"target":{"type":"Target"}}}`, ); const lacerateBuild = APLAction.fromJsonString( - `{"condition":{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":33745}}},"rhs":{"const":{"val":"3"}}}},"castSpell":{"spellId":{"spellId":33745}}}`, + `{"condition":{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"sourceUnit":{"type":"Target"},"auraId":{"spellId":33745}}},"rhs":{"const":{"val":"3"}}}},"castSpell":{"spellId":{"spellId":33745},"target":{"type":"Target"}}}`, ); - const maul = APLAction.fromJsonString(`{"castSpell":{"spellId":{"spellId":6807}}}`); + const maul = APLAction.fromJsonString(`{"castSpell":{"spellId":{"spellId":6807},"target":{"type":"Target"}}}`); prepullActions.push(...([simple.prepullStampede ? preStampede : null].filter(a => a) as Array)); @@ -262,6 +263,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecGuardianDruid, { 4: Presets.P4_PRESET.gear, }, }, + otherDefaults: Presets.OtherDefaults, }, ], }); diff --git a/ui/index.html b/ui/index.html index 8ed3d47bc0..04d4bb9050 100644 --- a/ui/index.html +++ b/ui/index.html @@ -211,7 +211,7 @@

Cataclysm

Druid Guardian - Beta + Launched