Merge branch 'midnight' of github.com:simulationcraft/simc into midnight

Author: HawkCorrigan

ActionPriorityLists/default/deathknight_frost.simc

@@ -49,10 +49,11 @@ actions.aoe+=/howling_blast,if=!buff.killing_machine.react&(talent.obliteration&
 
 # Cooldowns
 actions.cooldowns=remorseless_winter,if=variable.sending_cds&(active_enemies>1|talent.gathering_storm)|(buff.gathering_storm.stack=10&buff.remorseless_winter.remains<gcd.max)&fight_remains>10
-actions.cooldowns+=/reapers_mark,target_if=first:debuff.reapers_mark_debuff.down,if=cooldown.pillar_of_frost.remains<=gcd.max&(!talent.breath_of_sindragosa|cooldown.breath_of_sindragosa.remains>20|cooldown.breath_of_sindragosa.remains<gcd.max&runic_power>=40)|fight_remains<20
-actions.cooldowns+=/pillar_of_frost,if=variable.sending_cds&(!hero_tree.deathbringer|cooldown.reapers_mark.remains>10)&(!talent.breath_of_sindragosa|cooldown.breath_of_sindragosa.remains>20|cooldown.breath_of_sindragosa.up&runic_power>=60)|fight_remains<20
+actions.cooldowns+=/pillar_of_frost,if=!talent.breath_of_sindragosa&variable.sending_cds&(!hero_tree.deathbringer|rune>=2)|fight_remains<20
+actions.cooldowns+=/pillar_of_frost,if=talent.breath_of_sindragosa&variable.sending_cds&variable.breath_of_sindragosa_check&(!hero_tree.deathbringer|rune>=2)
 actions.cooldowns+=/breath_of_sindragosa,use_off_gcd=1,if=!buff.breath_of_sindragosa.up&(buff.pillar_of_frost.up|fight_remains<20)
-actions.cooldowns+=/frostwyrms_fury,if=((talent.apocalypse_now|talent.chosen_of_frostbrood)&!buff.chosen_of_frostbrood_fwf.up)&variable.sending_cds&(!talent.breath_of_sindragosa&buff.pillar_of_frost.up|buff.breath_of_sindragosa.up)|(fight_remains<20&!buff.chosen_of_frostbrood_haste.up)
+actions.cooldowns+=/reapers_mark,target_if=first:debuff.reapers_mark_debuff.down,if=buff.pillar_of_frost.up|cooldown.pillar_of_frost.remains>5|fight_remains<20
+actions.cooldowns+=/frostwyrms_fury,if=((talent.apocalypse_now|talent.chosen_of_frostbrood)&!buff.chosen_of_frostbrood_fwf.up)&variable.sending_cds&buff.pillar_of_frost.up&buff.bonegrinder_frost.up|(fight_remains<20&!buff.chosen_of_frostbrood_haste.up)
 actions.cooldowns+=/frostwyrms_fury,if=buff.chosen_of_frostbrood_fwf.up&variable.fwf_buffs
 actions.cooldowns+=/frostwyrms_fury,if=!(talent.apocalypse_now|talent.chosen_of_frostbrood)&active_enemies=1&(talent.pillar_of_frost&buff.pillar_of_frost.up&!talent.obliteration|!talent.pillar_of_frost)&(!raid_event.adds.exists|raid_event.adds.in>cooldown.frostwyrms_fury.duration+raid_event.adds.duration)&variable.fwf_buffs|fight_remains<3
 actions.cooldowns+=/frostwyrms_fury,if=!(talent.apocalypse_now|talent.chosen_of_frostbrood)&active_enemies>=2&(talent.pillar_of_frost&buff.pillar_of_frost.up|raid_event.adds.exists&raid_event.adds.up&raid_event.adds.in<cooldown.pillar_of_frost.remains-raid_event.adds.in-raid_event.adds.duration)&variable.fwf_buffs
@@ -98,8 +99,8 @@ actions.trinkets+=/use_item,slot=trinket2,if=!trinket.2.cast_time>0&variable.tri
 actions.trinkets+=/use_item,slot=trinket1,if=trinket.1.cast_time>0&(!hero_tree.rider_of_the_apocalypse|cooldown.frostwyrms_fury.remains)&variable.trinket_1_buffs&!variable.trinket_1_manual&cooldown.pillar_of_frost.remains<trinket.1.cast_time&(!talent.breath_of_sindragosa|variable.breath_of_sindragosa_check)&variable.sending_cds&(!trinket.2.has_cooldown|trinket.2.cooldown.remains|variable.trinket_priority=1)|variable.trinket_1_duration>=fight_remains
 actions.trinkets+=/use_item,slot=trinket2,if=trinket.2.cast_time>0&(!hero_tree.rider_of_the_apocalypse|cooldown.frostwyrms_fury.remains)&variable.trinket_2_buffs&!variable.trinket_2_manual&cooldown.pillar_of_frost.remains<trinket.2.cast_time&(!talent.breath_of_sindragosa|variable.breath_of_sindragosa_check)&variable.sending_cds&(!trinket.1.has_cooldown|trinket.1.cooldown.remains|variable.trinket_priority=2)|variable.trinket_2_duration>=fight_remains
 # If only one on use trinket provides a buff, use the other on cooldown. Or if neither trinket provides a buff, use both on cooldown.
-actions.trinkets+=/use_item,slot=trinket1,if=!variable.trinket_1_buffs&!variable.trinket_1_manual&(variable.damage_trinket_priority=1|(!trinket.2.has_cooldown|trinket.2.cooldown.remains))&((trinket.1.cast_time>0&(!talent.breath_of_sindragosa|!buff.breath_of_sindragosa.up)&!buff.pillar_of_frost.up|!trinket.1.cast_time>0)&(!variable.trinket_2_buffs|cooldown.pillar_of_frost.remains>20)|!talent.pillar_of_frost)|fight_remains<15
-actions.trinkets+=/use_item,slot=trinket2,if=!variable.trinket_2_buffs&!variable.trinket_2_manual&(variable.damage_trinket_priority=2|(!trinket.1.has_cooldown|trinket.1.cooldown.remains))&((trinket.2.cast_time>0&(!talent.breath_of_sindragosa|!buff.breath_of_sindragosa.up)&!buff.pillar_of_frost.up|!trinket.2.cast_time>0)&(!variable.trinket_1_buffs|cooldown.pillar_of_frost.remains>20)|!talent.pillar_of_frost)|fight_remains<15
+actions.trinkets+=/use_item,slot=trinket1,if=!variable.trinket_1_buffs&!variable.trinket_1_manual&(variable.damage_trinket_priority=1|(!trinket.2.has_cooldown|trinket.2.cooldown.remains))&((trinket.1.cast_time>0&(!talent.breath_of_sindragosa|!buff.breath_of_sindragosa.up)&!buff.pillar_of_frost.up|!trinket.1.cast_time>0)&(!variable.trinket_2_buffs|(cooldown.pillar_of_frost.remains<trinket.1.cooldown.remains))|!talent.pillar_of_frost)|fight_remains<15
+actions.trinkets+=/use_item,slot=trinket2,if=!variable.trinket_2_buffs&!variable.trinket_2_manual&(variable.damage_trinket_priority=2|(!trinket.1.has_cooldown|trinket.1.cooldown.remains))&(((trinket.2.cast_time>0&(!talent.breath_of_sindragosa|!buff.breath_of_sindragosa.up)&!buff.pillar_of_frost.up)|!trinket.2.cast_time>0)&(!variable.trinket_1_buffs|(cooldown.pillar_of_frost.remains<trinket.1.cooldown.remains))|!talent.pillar_of_frost)|fight_remains<15
 actions.trinkets+=/use_item,slot=main_hand,if=buff.pillar_of_frost.up|(buff.breath_of_sindragosa.up&cooldown.pillar_of_frost.remains)|(variable.trinket_1_buffs&variable.trinket_2_buffs&(trinket.1.cooldown.remains<cooldown.pillar_of_frost.remains|trinket.2.cooldown.remains<cooldown.pillar_of_frost.remains)&cooldown.pillar_of_frost.remains>20)|fight_remains<15
 
 # Variables

ActionPriorityLists/default/demonhunter_devourer.simc

@@ -64,15 +64,14 @@ actions.annihilator_ranged+=/devour,if=buff.soulburst.up&active_enemies=1
 actions.annihilator_ranged+=/consume,if=buff.soulburst.up
 actions.annihilator_ranged+=/void_ray,if=talent.eradicate&active_enemies>1&!buff.eradicate.up
 actions.annihilator_ranged+=/collapsing_star,if=active_enemies>1&buff.collapsing_star_stacking.stack>=30
-actions.annihilator_ranged+=/call_action_list,name=reaps,if=!buff.metamorphosis.up&action.reap.souls_consumed>=4&variable.wont_drop_meta
+actions.annihilator_ranged+=/call_action_list,name=reaps,if=active_enemies=1&!buff.metamorphosis.up&action.reap.souls_consumed>=4&variable.wont_drop_meta
 actions.annihilator_ranged+=/collapsing_star,if=active_enemies=1
-actions.annihilator_ranged+=/call_action_list,name=reaps,if=active_enemies>1&buff.eradicate.up&action.reap.souls_consumed>=1+3*set_bonus.midnight_season_2_4pc&variable.wont_drop_meta
-actions.annihilator_ranged+=/call_action_list,name=reaps,if=action.reap.souls_consumed>=4
+actions.annihilator_ranged+=/call_action_list,name=reaps,if=active_enemies=1&action.reap.souls_consumed>=4
 actions.annihilator_ranged+=/call_action_list,name=reaps,if=fight_remains<=6&action.reap.souls_consumed>=1
-actions.annihilator_ranged+=/call_action_list,name=reaps,if=talent.eradicate&active_enemies>1&buff.eradicate.up&action.reap.souls_consumed>=1+3*set_bonus.midnight_season_2_4pc
+actions.annihilator_ranged+=/call_action_list,name=reaps,if=active_enemies>1&buff.eradicate.up&action.reap.souls_consumed>=4+6*buff.moment_of_craving.up
 actions.annihilator_ranged+=/void_ray,if=!buff.eradicate.up|!buff.moment_of_craving.up|!set_bonus.midnight_season_2_4pc
 actions.annihilator_ranged+=/call_action_list,name=reaps,if=(!buff.eradicate.up|active_enemies=1)&(buff.voidfall_spending.stack>=3&prev_gcd.1.void_ray|buff.voidfall_spending.react>=3)
-actions.annihilator_ranged+=/call_action_list,name=reaps,if=buff.metamorphosis.up&talent.collapsing_star&buff.collapsing_star_stacking.stack+action.reap.souls_consumed>=30&variable.wont_overcap_cstar&void_metamorphosis_base_drain_ps>35&action.reap.souls_consumed>=1+3*set_bonus.midnight_season_2_4pc&variable.wont_drop_meta
+actions.annihilator_ranged+=/call_action_list,name=reaps,if=buff.metamorphosis.up&talent.collapsing_star&buff.collapsing_star_stacking.stack+action.reap.souls_consumed>=30&variable.wont_overcap_cstar&void_metamorphosis_base_drain_ps>35&action.reap.souls_consumed>=4&variable.wont_drop_meta
 actions.annihilator_ranged+=/soul_immolation,if=active_dot.soul_immolation=0&(!buff.metamorphosis.up|fury<void_metamorphosis_base_drain_ps)
 actions.annihilator_ranged+=/devour
 actions.annihilator_ranged+=/consume
@@ -121,11 +120,10 @@ actions.voidscarred_ranged+=/consume
 
 actions.vsm_meta=soul_immolation,if=variable.void_ray_count>=2&active_dot.soul_immolation=0&fury<=gcd.max*(void_metamorphosis_base_drain_ps-6)-6
 actions.vsm_meta+=/pick_up_fragment,mode=nearest,type=all,use_off_gcd=1,line_cd=0.35,if=variable.void_ray_count=1&cooldown.void_ray.remains<gcd.max*2&fury<void_metamorphosis_base_drain_ps*cooldown.void_ray.remains
-actions.vsm_meta+=/throw_glaive,if=variable.void_ray_count>=2&fury>void_metamorphosis_base_drain_ps*gcd.max*2&cooldown.void_ray.remains>gcd.max
 actions.vsm_meta+=/wait,sec=0.05,if=variable.void_ray_count>=2
 actions.vsm_meta+=/vengeful_retreat,use_off_gcd=1,if=buff.voidstep.up
 actions.vsm_meta+=/void_ray,if=variable.void_ray_count=0&!talent.eradicate
-actions.vsm_meta+=/eradicate,if=(action.reap.souls_consumed>=10|buff.moment_of_craving.remains<gcd.max|cooldown.void_ray.remains<gcd.max)&!buff.soulburst.up
+actions.vsm_meta+=/eradicate,if=(buff.moment_of_craving.remains<gcd.max|cooldown.void_ray.remains<gcd.max)&!buff.soulburst.up
 actions.vsm_meta+=/void_ray,if=talent.eradicate&!buff.eradicate.up
 actions.vsm_meta+=/reapers_toll,if=buff.hungering_slash.remains<gcd.max*2
 actions.vsm_meta+=/devour,if=buff.soulburst.up
@@ -145,9 +143,7 @@ actions.vsm_out+=/voidblade,if=prev_gcd.1.void_ray
 actions.vsm_out+=/metamorphosis,if=buff.eradicate.up|!talent.eradicate|fight_remains<15
 actions.vsm_out+=/the_hunt
 actions.vsm_out+=/consume,if=buff.soulburst.up&buff.soulburst.remains<gcd.max
-actions.vsm_out+=/eradicate,if=action.reap.souls_consumed>=10&buff.void_metamorphosis_stack.stack<buff.void_metamorphosis_stack.max_stack-3&!buff.soulburst.up
 actions.vsm_out+=/void_ray,if=talent.eradicate&!buff.eradicate.up
-actions.vsm_out+=/consume,if=buff.soulburst.up
 actions.vsm_out+=/hungering_slash
 actions.vsm_out+=/soul_immolation,if=active_dot.soul_immolation=0
 actions.vsm_out+=/reap,if=action.reap.souls_consumed>=4&!buff.soulburst.up

ActionPriorityLists/default/demonhunter_havoc.simc

@@ -21,16 +21,18 @@ actions.precombat+=/immolation_aura
 actions=auto_attack
 actions+=/immolation_aura,if=talent.violent_transformation&talent.a_fire_inside&cooldown.metamorphosis.remains<gcd.max*3
 actions+=/metamorphosis,if=(!talent.chaotic_transformation|!cooldown.blade_dance.up&cooldown.eye_beam.remains>8)&!action.death_sweep.demonsurge_available&!action.annihilation.demonsurge_available
+# actions+=/metamorphosis,if=!talent.chaotic_transformation|!cooldown.blade_dance.up&!cooldown.eye_beam.up
 actions+=/the_hunt,if=(!talent.eternal_hunt|cooldown.eye_beam.remains<10&cooldown.metamorphosis.remains>15|!cooldown.eye_beam.up&cooldown.metamorphosis.up|!hero_tree.felscarred)&!buff.reavers_glaive.up
 actions+=/vengeful_retreat,use_off_gcd=1,if=gcd.remains<0.3&cooldown.metamorphosis.remains&cooldown.eye_beam.remains<gcd.max*0.3&!buff.initiative.up|cooldown.metamorphosis.up&cooldown.eye_beam.remains&cooldown.blade_dance.remains&!buff.eternal_hunt.up
 actions+=/potion,if=cooldown.metamorphosis.up&(cooldown.eye_beam.up|!talent.chaotic_transformation)|fight_remains<=30
 actions+=/use_items,if=cooldown.metamorphosis.up|cooldown.eye_beam.up|fight_remains<=20
 actions+=/pick_up_fragment,type=all,use_off_gcd=1,if=fury<=40
 actions+=/reavers_glaive,if=buff.rending_strike.down&buff.glaive_flurry.down
-actions+=/immolation_aura,if=talent.a_fire_inside&talent.burning_wound&(charges=2|full_recharge_time<gcd.max*2)
 actions+=/annihilation,if=buff.rending_strike.up&buff.glaive_flurry.down&debuff.reavers_mark.stack<2|buff.rending_strike.up&active_enemies>=2
+actions+=/essence_break,if=action.death_sweep.demonsurge_available|action.annihilation.demonsurge_available
 actions+=/death_sweep,if=debuff.essence_break.up|action.death_sweep.demonsurge_available
-actions+=/annihilation,if=action.annihilation.demonsurge_available
+actions+=/annihilation,if=debuff.essence_break.up|action.annihilation.demonsurge_available
+actions+=/immolation_aura,if=talent.a_fire_inside&talent.burning_wound&(charges=2|full_recharge_time<gcd.max*2)
 actions+=/eye_beam
 actions+=/immolation_aura,,if=action.immolation_aura.demonsurge_available&buff.demonsurge.remains<gcd.max
 actions+=/felblade,if=buff.inertia_trigger.up

ActionPriorityLists/default/druid_feral.simc

@@ -16,6 +16,7 @@ actions.precombat+=/variable,name=regrowth,op=reset
 actions.precombat+=/variable,name=dotc_rake_threshold,op=set,value=99
 actions.precombat+=/variable,name=dotc_rake_threshold,op=set,if=talent.wild_slashes&talent.merciless_claws,value=5
 actions.precombat+=/variable,name=dotc_rake_threshold,op=set,if=talent.wild_slashes&!talent.merciless_claws,value=8
+actions.precombat+=/potion,pre_pot_time=12,if=potion.liquid_luster
 # for practicism, we give a 1s leeway (at 0% haste) from cast end until start of the fight.
 actions.precombat+=/variable,name=algethar_puzzle_box_precombat_cast,value=3,if=trinket.1.is.algethar_puzzle_box|!trinket.1.has_use_buff
 actions.precombat+=/use_item,name=algethar_puzzle_box,if=trinket.1.is.algethar_puzzle_box|!trinket.1.has_use_buff

ActionPriorityLists/default/druid_guardian.simc

@@ -24,20 +24,21 @@ actions+=/call_action_list,name=bear
 
 actions.bear=bear_form,if=!buff.bear_form.up&!buff.feline_potential.up&!talent.fluid_form.enabled
 actions.bear+=/mangle,if=buff.cat_form.up
+actions.bear+=/ironfur,use_off_gcd=1,if=buff.gory_fur_ironfur.up
 actions.bear+=/ironfur,use_off_gcd=1,if=rage>=40&!talent.killing_blow.enabled&!buff.answered_calling.up
 actions.bear+=/ironfur,use_off_gcd=1,if=rage>=80&!talent.killing_blow.enabled&buff.answered_calling.up
-actions.bear+=/ironfur,use_off_gcd=1,if=!buff.ironfur.up&!buff.answered_calling.up&talent.killing_blow.enabled
-actions.bear+=/ironfur,use_off_gcd=1,if=!buff.ironfur.up&rage>=80&buff.answered_calling.up&talent.killing_blow.enabled
-actions.bear+=/thrash,if=talent.lunar_calling.enabled
+actions.bear+=/ironfur,use_off_gcd=1,if=!buff.ironfur.up&!buff.answered_calling.up&talent.killing_blow.enabled&!buff.ravage.up
+actions.bear+=/ironfur,use_off_gcd=1,if=!buff.ironfur.up&rage>=80&buff.answered_calling.up&talent.killing_blow.enabled&!buff.ravage.up
+actions.bear+=/thrash,target_if=refreshable|(dot.thrash.stack<5&talent.flashing_claws.rank=2|dot.thrash.stack<4&talent.flashing_claws.rank=1|dot.thrash.stack<3&!talent.flashing_claws.enabled)
+actions.bear+=/mangle,if=buff.answered_calling.up&(active_enemies=1|buff.berserk.up&active_enemies<=4)&talent.fount_of_strength.enabled
+actions.bear+=/thrash,if=talent.lunar_calling.enabled|buff.answered_calling.up
 actions.bear+=/maul,if=buff.dream_conduit.up&!talent.fount_of_strength.enabled&!buff.answered_calling.up
-actions.bear+=/maul,if=buff.ravage.up&rage>=60&talent.killing_blow.enabled
-actions.bear+=/maul,if=buff.ravage.up&rage>=40&!talent.killing_blow.enabled&!talent.gory_fur.enabled
-actions.bear+=/maul,if=rage>=55&!talent.fount_of_strength.enabled&talent.killing_blow.enabled&!buff.answered_calling.up
-actions.bear+=/maul,if=rage>=90&!talent.fount_of_strength.enabled&talent.killing_blow.enabled&buff.answered_calling.up
+actions.bear+=/maul,if=rage>=55&talent.killing_blow.enabled&!buff.answered_calling.up
+actions.bear+=/maul,if=rage>=80&talent.killing_blow.enabled&buff.answered_calling.up
 actions.bear+=/maul,if=buff.gory_fur_maul.up&talent.raze.enabled
 actions.bear+=/maul,if=buff.gory_fur_maul.up&!talent.raze.enabled&active_enemies<3
 actions.bear+=/thrash,if=active_enemies>=3&talent.fount_of_strength.enabled
-actions.bear+=/mangle,if=dot.red_moon.ticking
+actions.bear+=/mangle,if=dot.red_moon.ticking|(buff.gorestained_claws.up|buff.answered_calling.up)&talent.fount_of_strength.enabled
 actions.bear+=/rake,if=!buff.cat_form.up&talent.fluid_form.enabled&cooldown.heart_of_the_wild.up&talent.heart_of_the_wild.enabled&(active_enemies<=5&talent.moonkin_form.enabled|!talent.moonkin_form.enabled)
 actions.bear+=/cat_form,if=!buff.cat_form.up&!talent.fluid_form.enabled&cooldown.heart_of_the_wild.up&talent.heart_of_the_wild.enabled&(active_enemies<=5&talent.moonkin_form.enabled|!talent.moonkin_form.enabled)&(rage<30&!talent.fount_of_strength.enabled|talent.fount_of_strength.enabled)
 actions.bear+=/moonkin_form,if=!buff.moonkin_form.up&cooldown.heart_of_the_wild.up&active_enemies>=6&talent.moonkin_form.enabled
@@ -69,4 +70,4 @@ actions.cooldowns+=/heart_of_the_wild,if=(active_enemies<=5&talent.moonkin_form.
 actions.cooldowns+=/convoke_the_spirits,if=buff.bear_form.up
 actions.cooldowns+=/sundering_roar,if=(dot.thrash.stack>4&talent.flashing_claws.rank=2|dot.thrash.stack>3&talent.flashing_claws.rank=1|dot.thrash.stack>2&!talent.flashing_claws.enabled)&!cooldown.thrash.up
 actions.cooldowns+=/berserk,if=(!cooldown.heart_of_the_wild.up&(talent.heart_of_the_wild.enabled)|!talent.ravage.enabled|!talent.heart_of_the_wild.enabled)&(!cooldown.thrash.up|(buff.cat_form.up&!talent.convoke_the_spirits.enabled))
-actions.cooldowns+=/wild_guardian,if=(buff.ravage.up&talent.ravage.enabled)|!talent.ravage.enabled&buff.lunar_beam.up
+actions.cooldowns+=/wild_guardian,if=!buff.answered_calling.up&buff.lunar_beam.up