Merge branch 'simulationcraft:midnight' into midnight

Author: HawkCorrigan

ActionPriorityLists/default/deathknight_unholy.simc

@@ -70,13 +70,13 @@ actions.single_target+=/putrefy,if=!talent.soul_reaper&cooldown.dark_transformat
 actions.single_target+=/death_coil
 
 # Trinkets
-actions.trinkets=use_item,slot=trinket1,if=variable.trinket_1_buffs&(variable.trinket_priority=1|!variable.trinket_2_buffs|!trinket.2.has_cooldown)&(variable.cds_active)
-actions.trinkets+=/use_item,slot=trinket2,if=variable.trinket_2_buffs&(variable.trinket_priority=2|!variable.trinket_1_buffs|!trinket.1.has_cooldown)&(variable.cds_active)
+actions.trinkets=use_item,slot=trinket1,if=variable.trinket_1_buffs&(variable.trinket_priority=1|!variable.trinket_2_buffs|!trinket.2.has_cooldown)&(trinket.1.cast_time>0&trinket.1.cast_time<cooldown.army_of_the_dead.remains&(!talent.festering_scythe|debuff.festering_scythe_debuff.up)|variable.cds_active)
+actions.trinkets+=/use_item,slot=trinket2,if=variable.trinket_2_buffs&(variable.trinket_priority=2|!variable.trinket_1_buffs|!trinket.1.has_cooldown)&(trinket.2.cast_time>0&trinket.2.cast_time<cooldown.army_of_the_dead.remains&(!talent.festering_scythe|debuff.festering_scythe_debuff.up)|variable.cds_active)
 actions.trinkets+=/use_item,slot=trinket1,if=!variable.trinket_1_buffs&(variable.damage_trinket_priority=1|!variable.trinket_2_buffs|!trinket.2.has_cooldown)
 actions.trinkets+=/use_item,slot=trinket2,if=!variable.trinket_2_buffs&(variable.damage_trinket_priority=2|!variable.trinket_1_buffs|!trinket.1.has_cooldown)
 
 # Variables
-actions.variables=variable,name=spending_rp,value=rune<2|buff.forbidden_knowledge.up&rune<4|buff.sudden_doom.react
+actions.variables=variable,name=spending_rp,value=rune<2|buff.forbidden_knowledge.up&(rune<4|active_enemies>=6)|buff.sudden_doom.react|active_enemies>=7
 actions.variables+=/variable,name=st_planning,op=setif,value=1,value_else=0,condition=active_enemies=1&(!raid_event.adds.exists|!raid_event.adds.in|raid_event.adds.in>15|!raid_event.pull.exists|raid_event.pull.exists&raid_event.pull.in>15)
 actions.variables+=/variable,name=adds_remain,value=active_enemies>=2&((!raid_event.adds.exists|!raid_event.pull.exists)|raid_event.adds.remains>5|raid_event.pull.remains>5)
 actions.variables+=/variable,name=cds_active,value=pet.lesser_ghoul_army.active|buff.forbidden_knowledge.up|buff.dark_transformation.up&buff.dark_transformation.remains>5

ActionPriorityLists/default/druid_balance.simc

@@ -29,7 +29,7 @@ actions.precombat+=/starfire,if=hero_tree.elunes_chosen|enemies>1
 # Executed every time the actor is available.
 # Items, Racials & PI
 actions=use_items,if=buff.ca_inc.up&(buff.harmony_of_the_grove.up|!talent.dream_surge)|fight_remains<cooldown.ca_inc.remains
-actions+=/potion,if=buff.harmony_of_the_grove.up&!variable.ec|buff.ca_inc.up&variable.ec|variable.opener&prev_gcd.1.solar_eclipse|fight_remains<=30
+actions+=/potion,if=buff.harmony_of_the_grove.up&buff.ca_inc.up&!variable.ec|buff.ca_inc.up&variable.ec|variable.opener&prev_gcd.1.solar_eclipse|fight_remains<=30
 actions+=/berserking,if=buff.ca_inc.up&(buff.harmony_of_the_grove.up|!talent.dream_surge)|fight_remains<cooldown.ca_inc.remains
 actions+=/invoke_external_buff,name=power_infusion,if=buff.ca_inc.up
 # Variables Definition
@@ -100,30 +100,32 @@ actions.ec_st+=/starfire,if=!variable.eclipse_down
 actions.ec_st+=/wrath,if=variable.eclipse_down
 
 # Cooldowns
-actions.kotg_st=celestial_alignment,if=prev_gcd.1.force_of_nature|fight_remains<20
+actions.kotg_st=celestial_alignment,if=prev_gcd.1.force_of_nature|fight_remains<20&buff.ca_inc.down
 # Dots
 actions.kotg_st+=/moonfire,target_if=remains<2|refreshable&variable.eclipse_down
 actions.kotg_st+=/sunfire,target_if=remains<2|refreshable&variable.eclipse_down
+# Cast Sunfire Before Cooldowns
+actions.kotg_st+=/sunfire,target_if=variable.opener&buff.eclipse.up&buff.ascendant_stars.down&!buff.harmony_of_the_grove.up,line_cd=20
+actions.kotg_st+=/sunfire,target_if=!variable.opener&dot.sunfire.remains<10&variable.ca_soon&cooldown.force_of_nature.remains<3,line_cd=20
 # Fury of Elune
-actions.kotg_st+=/fury_of_elune,if=variable.opener&!variable.eclipse_down&buff.ascendant_stars.down|!variable.opener&(buff.harmony_of_the_grove.up|cooldown.force_of_nature.remains<gcd.max|talent.radiant_moonlight&cooldown.force_of_nature.remains>20)
-# Enter Eclipse
-actions.kotg_st+=/solar_eclipse,if=variable.opener&cooldown.eclipse.charges=2|!variable.opener&cooldown.solar_eclipse.charges_fractional>1.5&variable.cd_window|cooldown.solar_eclipse.ready&variable.cd_window_narrow|fight_remains<15
+actions.kotg_st+=/fury_of_elune,if=variable.opener|!variable.opener&(buff.harmony_of_the_grove.up|cooldown.force_of_nature.remains<gcd.max|talent.radiant_moonlight&cooldown.force_of_nature.remains>20)
+actions.kotg_st+=/solar_eclipse,if=!variable.opener&cooldown.solar_eclipse.charges_fractional>1.5&variable.cd_window|cooldown.solar_eclipse.ready&variable.cd_window_narrow|fight_remains<20+(20*cooldown.ca_inc.ready)
 # Treants
-actions.kotg_st+=/force_of_nature,if=variable.opener&buff.ascendant_stars.down&dot.sunfire.remains>16|!variable.opener&(buff.eclipse.remains>cooldown.force_of_nature.duration|!buff.eclipse.up&(cooldown.eclipse.remains<gcd.max|cooldown.ca_inc.ready&(!talent.convoke_the_spirits|cooldown.convoke_the_spirits.remains<gcd.max*5)))|fight_remains<15
+actions.kotg_st+=/force_of_nature,if=talent.aetherial_kindling&buff.eclipse.remains<8|((buff.eclipse.down&!talent.early_spring|talent.early_spring)&(cooldown.eclipse.remains<gcd.max|cooldown.ca_inc.ready&(!talent.convoke_the_spirits|cooldown.convoke_the_spirits.remains<gcd.max*5)))|fight_remains<21
 # Convoke
-actions.kotg_st+=/convoke_the_spirits,if=buff.ca_inc.up&astral_power<40|cooldown.ca_inc.remains>50&buff.harmony_of_the_grove.up&buff.ca_inc.down&astral_power<50
+actions.kotg_st+=/convoke_the_spirits,if=buff.ca_inc.up&astral_power<40|cooldown.ca_inc.remains>50&buff.harmony_of_the_grove.up&buff.ca_inc.down&astral_power<50|fight_remains<action.convoke_the_spirits.execute_time+1
 # Cast Wrath if Going Solar
-actions.kotg_st+=/wrath,if=!talent.convoke_the_spirits&buff.ascendant_stars.down&(variable.opener&astral_power<50|!variable.opener&astral_power<80&variable.no_weaver_procs&cooldown.force_of_nature.remains<15)
+actions.kotg_st+=/wrath,if=!talent.convoke_the_spirits&buff.ascendant_stars.down&(astral_power<50|astral_power<80&variable.no_weaver_procs&cooldown.force_of_nature.remains<15)
 # Cast Sunfire Before Cooldowns
-actions.kotg_st+=/sunfire,target_if=variable.opener&buff.ascendant_stars.down|!variable.opener&dot.sunfire.remains<10&variable.ca_soon&cooldown.force_of_nature.remains<3,line_cd=10
+actions.kotg_st+=/sunfire,target_if=dot.sunfire.remains<10&variable.ca_soon&cooldown.force_of_nature.remains<3,line_cd=10
 # Spenders
 actions.kotg_st+=/starfall,if=buff.starweavers_warp.react
-actions.kotg_st+=/starsurge,if=(astral_power>action.starsurge.cost*2-(1*(buff.starweavers_weft.react+buff.touch_the_cosmos.react+buff.starweavers_warp.react))|buff.eclipse_solar.up)|buff.touch_the_cosmos.react&buff.ascendant_stars.up|buff.starweavers_weft.react
+actions.kotg_st+=/starsurge,if=buff.eclipse.down&astral_power.deficit<20|buff.eclipse.up&action.starsurge.cost>1&(buff.eclipse.remains>5|astral_power.deficit<20)|buff.touch_the_cosmos.react|buff.starweavers_weft.react
 # Instant Builder
 actions.kotg_st+=/starfire,if=buff.ascendant_fires.up&buff.eclipse_lunar.up
 # Builders
 actions.kotg_st+=/new_moon,if=astral_power.deficit>energize_amount
 actions.kotg_st+=/half_moon,if=astral_power.deficit>energize_amount
 actions.kotg_st+=/full_moon,if=astral_power.deficit>energize_amount
-actions.kotg_st+=/wild_mushroom,if=buff.eclipse_solar.up|cooldown.wild_mushroom.full_recharge_time<cooldown.ca_inc.remains
+actions.kotg_st+=/wild_mushroom,if=buff.eclipse.up|cooldown.wild_mushroom.full_recharge_time<cooldown.ca_inc.remains
 actions.kotg_st+=/wrath