Skip to content

Commit

Permalink
Fix target_if conditionals in updated priorities.
Browse files Browse the repository at this point in the history
  • Loading branch information
Hekili committed Mar 16, 2022
1 parent 5e7a0c5 commit 69d5bc0
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Classes/DruidBalance.lua

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Classes/HunterSurvival.lua

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Classes/Notes/90_Druid_Balance.simc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## Balance Druid
## March 15, 2022
## March 16, 2022

## Changes:
## - Added Solar Beam.
Expand Down Expand Up @@ -94,7 +94,7 @@ actions.aoe+=/starsurge,if=variable.dream_will_fall_off&variable.starfall_wont_f
# Use swarm so that you get max uptime by using it as late as possible on less than 3 stacks or just when 3+ stacks expire
actions.aoe+=/adaptive_swarm,cycle_targets=1,if=!ticking&!action.adaptive_swarm_damage.in_flight|dot.adaptive_swarm_damage.stack<3&dot.adaptive_swarm_damage.remains<3
# Refresh Moonfire if CA/Inc is ready, there are less than 5 targets in Lunar Eclipse with SotF, less than 10 otherwise in any Eclipse or up to 5 targets before a Lunar Eclipse. Don't refresh during Kindred Empowerment unless in Solar Eclipse
actions.aoe+=/moonfire,target_if=refreshable&target.time_to_die>((14+(spell_targets.starfire*2*buff.eclipse_lunar.up))+remains)%(1+talent.twin_moons.enabled),if=astral_power>variable.sf_cost-buff.starfall.remains*6&(ap_check|variable.ignore_starsurge|!eclipse.in_any)&(cooldown.ca_inc.ready&eclipse.in_any&!druid.no_cds&(variable.convoke_desync|cooldown.convoke_the_spirits.ready|!covenant.night_fae)|spell_targets.starfire<((8-(buff.eclipse_lunar.up*3))*(1+talent.twin_moons.enabled))&!eclipse.solar_next&(!cooldown.ca_inc.ready|druid.no_cds)|(eclipse.in_solar|buff.eclipse_lunar.up&!talent.soul_of_the_forest.enabled)&(spell_targets.starfire<10*(1+talent.twin_moons.enabled)))&(!covenant.kyrian|!buff.kindred_empowerment_energize.up|eclipse.in_solar)&!buff.ravenous_frenzy_sinful_hysteria.up
actions.aoe+=/moonfire,cycle_targets=1,if=refreshable&target.time_to_die>((14+(spell_targets.starfire*2*buff.eclipse_lunar.up))+remains)%(1+talent.twin_moons.enabled)&astral_power>variable.sf_cost-buff.starfall.remains*6&(ap_check|variable.ignore_starsurge|!eclipse.in_any)&(cooldown.ca_inc.ready&eclipse.in_any&!druid.no_cds&(variable.convoke_desync|cooldown.convoke_the_spirits.ready|!covenant.night_fae)|spell_targets.starfire<((8-(buff.eclipse_lunar.up*3))*(1+talent.twin_moons.enabled))&!eclipse.solar_next&(!cooldown.ca_inc.ready|druid.no_cds)|(eclipse.in_solar|buff.eclipse_lunar.up&!talent.soul_of_the_forest.enabled)&(spell_targets.starfire<10*(1+talent.twin_moons.enabled)))&(!covenant.kyrian|!buff.kindred_empowerment_energize.up|eclipse.in_solar)&!buff.ravenous_frenzy_sinful_hysteria.up
# Use FoN on cd without capping
actions.aoe+=/force_of_nature,if=ap_check|variable.ignore_starsurge
actions.aoe+=/variable,name=cd_condition_aoe,value=!druid.no_cds&(variable.cd_condition&(buff.starfall.up|talent.stellar_drift.enabled|covenant.night_fae)&dot.moonfire.ticking&(!buff.solstice.up&!buff.ca_inc.up&(!talent.fury_of_elune.enabled|buff.ca_inc.duration>cooldown.fury_of_elune.remains+8)&(!set_bonus.tier28_2pc|eclipse.in_lunar|eclipse.solar_next)&variable.thrill_seeker_wait&(!covenant.night_fae|variable.convoke_desync|cooldown.convoke_the_spirits.remains<15)&target.time_to_die>buff.ca_inc.duration*0.7)|boss&fight_remains<buff.ca_inc.duration+12*runeforge.primordial_arcanic_pulsar)
Expand Down
4 changes: 2 additions & 2 deletions Classes/Notes/90_Hunter_Survival.simc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Survival Hunter
# March 5, 2022
# March 16, 2022

actions.precombat+=/variable,name=mb_rs_cost,op=setif,value=action.mongoose_bite.cost,value_else=action.raptor_strike.cost,condition=talent.mongoose_bite
actions.precombat+=/summon_pet
Expand Down Expand Up @@ -83,7 +83,7 @@ actions.cleave+=/wildfire_bomb,if=buff.mad_bombardier.up
actions.cleave+=/kill_command,cycle_targets=1,if=dot.pheromone_bomb.ticking&set_bonus.tier28_2pc
actions.cleave+=/kill_shot,if=buff.flayers_mark.up
actions.cleave+=/flayed_shot,cycle_targets=1
actions.cleave+=/serpent_sting,target_if=min:remains,if=refreshable&!ticking&next_wi_bomb.volatile&target.time_to_die>15&focus+cast_regen>35&active_enemies<=4
actions.cleave+=/serpent_sting,cycle_targets=1,if=refreshable&!ticking&next_wi_bomb.volatile&target.time_to_die>15&focus+cast_regen>35&active_enemies<=4
actions.cleave+=/kill_command,cycle_targets=1,if=focus+cast_regen<focus.max&full_recharge_time<gcd&(runeforge.nessingwarys_trapping_apparatus.equipped&cooldown.freezing_trap.remains&cooldown.tar_trap.remains|!runeforge.nessingwarys_trapping_apparatus.equipped)
actions.cleave+=/wildfire_bomb,if=!dot.wildfire_bomb.ticking&!set_bonus.tier28_2pc|charges_fractional>1.3
actions.cleave+=/butchery,if=(!next_wi_bomb.shrapnel|!talent.wildfire_infusion.enabled)&cooldown.wildfire_bomb.full_recharge_time>spell_targets%2
Expand Down
6 changes: 3 additions & 3 deletions Classes/Notes/90_Priest_Shadow.simc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## Shadow Priest
## March 7, 2022
## March 16, 2022

## Changes:
## - Tweak Void Torrent when target counts are forced.
Expand Down Expand Up @@ -123,10 +123,10 @@ actions.main+=/vampiric_touch,cycle_targets=1,if=refreshable&target.time_to_die>
# Special condition to stop casting SW:P on off-targets when fighting 3 or more stacked mobs and using Psychic Link and NOT Misery.
actions.main+=/shadow_word_pain,if=refreshable&target.time_to_die>4&!talent.misery.enabled&talent.psychic_link.enabled&spell_targets.mind_sear>2
# Keep SW:P up on as many targets as possible, except when fighting 3 or more stacked mobs with Psychic Link.
actions.main+=/shadow_word_pain,target_if=refreshable&target.time_to_die>4&!talent.misery.enabled&!(talent.searing_nightmare.enabled&spell_targets.mind_sear>variable.mind_sear_cutoff)&(!talent.psychic_link.enabled|(talent.psychic_link.enabled&spell_targets.mind_sear<=2))
actions.main+=/shadow_word_pain,cycle_targets=1,if=refreshable&target.time_to_die>4&!talent.misery.enabled&!(talent.searing_nightmare.enabled&spell_targets.mind_sear>variable.mind_sear_cutoff)&(!talent.psychic_link.enabled|(talent.psychic_link.enabled&spell_targets.mind_sear<=2))
# Use Fleshcraft outside of main cooldowns to maintain Volatile Solvent buff.
actions.main+=/fleshcraft,if=soulbind.volatile_solvent&!buff.voidform.up&!buff.power_infusion.up&buff.volatile_solvent.remains<10,interrupt_immediate=1,interrupt_if=ticks>=1
actions.main+=/mind_sear,target_if=spell_targets.mind_sear>variable.mind_sear_cutoff,chain=1,interrupt_immediate=1,interrupt_if=ticks>=2
actions.main+=/mind_sear,cycle_targets=1,if=spell_targets.mind_sear>variable.mind_sear_cutoff,chain=1,interrupt_immediate=1,interrupt_if=ticks>=2
actions.main+=/mind_flay,chain=1,interrupt_immediate=1,interrupt_if=ticks>=2&(!buff.dark_thought.up|cooldown.void_bolt.up&(buff.voidform.up|!buff.dark_thought.up&buff.dissonant_echoes.up))
# Use SW:D as last resort if on the move
actions.main+=/shadow_word_death
Expand Down
2 changes: 1 addition & 1 deletion Classes/PriestShadow.lua

Large diffs are not rendered by default.

0 comments on commit 69d5bc0

Please sign in to comment.