Fury Slayer Rampage vs. Execute; Charge min range option

Hekili · Nov 19, 2024 · 2f4e4d0 · 2f4e4d0
1 parent c4539ba
commit 2f4e4d0
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 27 deletions.
diff --git a/Classes.lua b/Classes.lua
@@ -80,6 +80,8 @@ local specTemplate = {
         }
     },
 
+    placeboBar = 3,
+
     ranges = {},
     settings = {},
     phases = {},

diff --git a/TheWarWithin/Priorities/WarriorFury.simc b/TheWarWithin/Priorities/WarriorFury.simc
@@ -19,10 +19,20 @@ actions+=/pummel,if=target.debuff.casting.react
 actions+=/charge,if=time<=0.5|movement.distance>5
 actions+=/heroic_leap,if=movement.distance>25
 actions+=/potion
-actions+=/call_action_list,name=variables
-actions+=/call_action_list,name=trinkets
-actions+=/lights_judgment,if=variable.on_gcd_racials
-actions+=/bag_of_tricks,if=variable.on_gcd_racials
+actions+=/variable,name=st_planning,value=active_enemies=1&(raid_event.adds.in>15|!raid_event.adds.exists)
+actions+=/variable,name=adds_remain,value=active_enemies>=2&(!raid_event.adds.exists|raid_event.adds.exists&raid_event.adds.remains>5)
+actions+=/variable,name=execute_phase,value=(talent.massacre.enabled&target.health.pct<35)|target.health.pct<20
+## actions.trinkets+=/do_treacherous_transmitter_task
+actions+=/use_item,name=treacherous_transmitter,if=variable.adds_remain|variable.st_planning
+# Trinkets The trinket with the highest estimated value, will be used first and paired with Avatar.
+actions+=/use_item,slot=trinket1,if=variable.trinket_1_buffs&!variable.trinket_1_manual&(!buff.avatar.up&trinket.1.cast_time>0|!trinket.1.cast_time>0)&((talent.titans_torment&cooldown.avatar.ready)|(buff.avatar.up&!talent.titans_torment))&(variable.trinket_2_exclude|!trinket.2.has_cooldown|trinket.2.cooldown.remains|variable.trinket_priority=1)|trinket.1.proc.any_dps.duration>=fight_remains&boss
+actions+=/use_item,slot=trinket2,if=variable.trinket_2_buffs&!variable.trinket_2_manual&(!buff.avatar.up&trinket.2.cast_time>0|!trinket.2.cast_time>0)&((talent.titans_torment&cooldown.avatar.ready)|(buff.avatar.up&!talent.titans_torment))&(variable.trinket_1_exclude|!trinket.1.has_cooldown|trinket.1.cooldown.remains|variable.trinket_priority=2)|trinket.2.proc.any_dps.duration>=fight_remains&boss
+# 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+=/use_item,slot=trinket1,if=!variable.trinket_1_buffs&(trinket.1.cast_time>0&!buff.avatar.up|!trinket.1.cast_time>0)&!variable.trinket_1_manual&(!variable.trinket_1_buffs&(trinket.2.cooldown.remains|!variable.trinket_2_buffs)|(trinket.1.cast_time>0&!buff.avatar.up|!trinket.1.cast_time>0)|cooldown.avatar.remains_expected>20)
+actions+=/use_item,slot=trinket2,if=!variable.trinket_2_buffs&(trinket.2.cast_time>0&!buff.avatar.up|!trinket.2.cast_time>0)&!variable.trinket_2_manual&(!variable.trinket_2_buffs&(trinket.1.cooldown.remains|!variable.trinket_1_buffs)|(trinket.2.cast_time>0&!buff.avatar.up|!trinket.2.cast_time>0)|cooldown.avatar.remains_expected>20)
+actions+=/use_item,slot=main_hand,if=!equipped.fyralath_the_dreamrender&(!variable.trinket_1_buffs|trinket.1.cooldown.remains)&(!variable.trinket_2_buffs|trinket.2.cooldown.remains)
+actions+=/lights_judgment,if=buff.recklessness.down&buff.avatar.down&rage<80&buff.bloodbath.down&buff.crushing_blow.down&buff.sudden_death.down&!cooldown.bladestorm.ready&(!cooldown.execute.ready|!variable.execute_phase)
+actions+=/bag_of_tricks,if=buff.recklessness.down&buff.avatar.down&rage<80&buff.bloodbath.down&buff.crushing_blow.down&buff.sudden_death.down&!cooldown.bladestorm.ready&(!cooldown.execute.ready|!variable.execute_phase)
 actions+=/berserking,if=buff.recklessness.up
 actions+=/blood_fury
 actions+=/fireblood
@@ -42,7 +52,7 @@ actions.slayer_am_st+=/avatar,if=(talent.titans_torment&(buff.enrage.up|talent.t
 actions.slayer_am_st+=/thunderous_roar,if=buff.enrage.up
 actions.slayer_am_st+=/champions_spear,if=(buff.enrage.up&talent.titans_torment&cooldown.avatar.remains<gcd)|(buff.enrage.up&!talent.titans_torment)
 actions.slayer_am_st+=/odyns_fury,if=dot.odyns_fury_torment_mh.remains<1&(buff.enrage.up|talent.titanic_rage)&cooldown.avatar.remains
-actions.slayer_am_st+=/execute,if=debuff.marked_for_execution.stack=3|buff.ashen_juggernaut.remains<2|buff.sudden_death.stack=2&buff.sudden_death.remains<7|buff.sudden_death.remains<2
+actions.slayer_am_st+=/execute,if=debuff.marked_for_execution.stack=3|talent.ashen_juggernaut&buff.ashen_juggernaut.remains<2|buff.sudden_death.stack=2&buff.sudden_death.remains<7|buff.sudden_death.up&buff.sudden_death.remains<2
 actions.slayer_am_st+=/rampage,if=talent.bladestorm&cooldown.bladestorm.remains<=gcd&!debuff.champions_might.up
 actions.slayer_am_st+=/bladestorm,if=buff.enrage.up&(cooldown.recklessness.remains>=9|cooldown.avatar.remains>=9)
 actions.slayer_am_st+=/onslaught,if=talent.tenderize&buff.brutal_finish.up
@@ -68,7 +78,7 @@ actions.slayer_ra_st+=/champions_spear,if=(buff.enrage.up&talent.titans_torment&
 actions.slayer_ra_st+=/odyns_fury,if=dot.odyns_fury_torment_mh.remains<1&(buff.enrage.up|talent.titanic_rage)&cooldown.avatar.remains
 actions.slayer_ra_st+=/rampage,if=talent.bladestorm&cooldown.bladestorm.remains<=gcd&!debuff.champions_might.up
 actions.slayer_ra_st+=/bladestorm,if=buff.enrage.up&cooldown.avatar.remains>=9
-actions.slayer_ra_st+=/execute,if=debuff.marked_for_execution.stack=3|buff.ashen_juggernaut.remains<2|buff.sudden_death.stack=2&buff.sudden_death.remains<7|buff.sudden_death.remains<2
+actions.slayer_ra_st+=/execute,if=debuff.marked_for_execution.stack=3|talent.ashen_juggernaut&buff.ashen_juggernaut.remains<2|buff.sudden_death.stack=2&buff.sudden_death.remains<7|buff.sudden_death.up&buff.sudden_death.remains<2
 actions.slayer_ra_st+=/onslaught,if=talent.tenderize&buff.brutal_finish.up
 actions.slayer_ra_st+=/bloodbath,if=crit_pct_current>=85|buff.bloodcraze.stack>=3
 actions.slayer_ra_st+=/crushing_blow
@@ -222,21 +232,4 @@ actions.thane_ra_mt+=/raging_blow
 actions.thane_ra_mt+=/onslaught
 actions.thane_ra_mt+=/rampage
 actions.thane_ra_mt+=/execute
-actions.thane_ra_mt+=/whirlwind
-
-# Trinkets
-## actions.trinkets+=/do_treacherous_transmitter_task
-actions.trinkets+=/use_item,name=treacherous_transmitter,if=variable.adds_remain|variable.st_planning
-# Trinkets The trinket with the highest estimated value, will be used first and paired with Avatar.
-actions.trinkets+=/use_item,slot=trinket1,if=variable.trinket_1_buffs&!variable.trinket_1_manual&(!buff.avatar.up&trinket.1.cast_time>0|!trinket.1.cast_time>0)&((talent.titans_torment&cooldown.avatar.ready)|(buff.avatar.up&!talent.titans_torment))&(variable.trinket_2_exclude|!trinket.2.has_cooldown|trinket.2.cooldown.remains|variable.trinket_priority=1)|trinket.1.proc.any_dps.duration>=fight_remains&boss
-actions.trinkets+=/use_item,slot=trinket2,if=variable.trinket_2_buffs&!variable.trinket_2_manual&(!buff.avatar.up&trinket.2.cast_time>0|!trinket.2.cast_time>0)&((talent.titans_torment&cooldown.avatar.ready)|(buff.avatar.up&!talent.titans_torment))&(variable.trinket_1_exclude|!trinket.1.has_cooldown|trinket.1.cooldown.remains|variable.trinket_priority=2)|trinket.2.proc.any_dps.duration>=fight_remains&boss
-# 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&(trinket.1.cast_time>0&!buff.avatar.up|!trinket.1.cast_time>0)&!variable.trinket_1_manual&(!variable.trinket_1_buffs&(trinket.2.cooldown.remains|!variable.trinket_2_buffs)|(trinket.1.cast_time>0&!buff.avatar.up|!trinket.1.cast_time>0)|cooldown.avatar.remains_expected>20)
-actions.trinkets+=/use_item,slot=trinket2,if=!variable.trinket_2_buffs&(trinket.2.cast_time>0&!buff.avatar.up|!trinket.2.cast_time>0)&!variable.trinket_2_manual&(!variable.trinket_2_buffs&(trinket.1.cooldown.remains|!variable.trinket_1_buffs)|(trinket.2.cast_time>0&!buff.avatar.up|!trinket.2.cast_time>0)|cooldown.avatar.remains_expected>20)
-actions.trinkets+=/use_item,slot=main_hand,if=!equipped.fyralath_the_dreamrender&(!variable.trinket_1_buffs|trinket.1.cooldown.remains)&(!variable.trinket_2_buffs|trinket.2.cooldown.remains)
-
-# Variables
-actions.variables+=/variable,name=st_planning,value=active_enemies=1&(raid_event.adds.in>15|!raid_event.adds.exists)
-actions.variables+=/variable,name=adds_remain,value=active_enemies>=2&(!raid_event.adds.exists|raid_event.adds.exists&raid_event.adds.remains>5)
-actions.variables+=/variable,name=execute_phase,value=(talent.massacre.enabled&target.health.pct<35)|target.health.pct<20
-actions.variables+=/variable,name=on_gcd_racials,value=buff.recklessness.down&buff.avatar.down&rage<80&buff.bloodbath.down&buff.crushing_blow.down&buff.sudden_death.down&!cooldown.bladestorm.ready&(!cooldown.execute.ready|!variable.execute_phase)
+actions.thane_ra_mt+=/whirlwind