Skip to content

Commit dc28297

Browse files
HinaloverHinalover
committed
[Monk] WW APL update for 8.3
1 parent f41a7d2 commit dc28297

File tree

1 file changed

+34
-88
lines changed

1 file changed

+34
-88
lines changed

‎engine/class_modules/sc_monk.cpp‎

Lines changed: 34 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -9614,7 +9614,7 @@ std::string monk_t::default_food() const
96149614
break;
96159615
case MONK_WINDWALKER:
96169616
if ( true_level > 110 )
9617-
return "biltong";
9617+
return "mechdowels_big_mech";
96189618
else if ( true_level > 100 )
96199619
return "lavish_suramar_feast";
96209620
else if ( true_level > 90 )
@@ -9684,6 +9684,7 @@ void monk_t::apl_pre_windwalker()
96849684
pre->add_action( "snapshot_stats", "Snapshot raid buffed stats before combat begins and pre-potting is done." );
96859685

96869686
pre->add_action( "potion" );
9687+
pre->add_action( "variable,name=coral_double_tod_on_use,op=set,value=equipped.ashvanes_razor_coral&(equipped.cyclotronic_blast|equipped.lustrous_golden_plumage)" );
96879688
pre->add_talent( this, "Chi Burst", "if=(!talent.serenity.enabled|!talent.fist_of_the_white_tiger.enabled)" );
96889689
pre->add_talent( this, "Chi Wave", "if=talent.fist_of_the_white_tiger.enabled" );
96899690
pre->add_talent( this, "Invoke Xuen, the White Tiger" );
@@ -9816,8 +9817,7 @@ void monk_t::apl_combat_windwalker()
98169817
{
98179818
if ( true_level >= 100 )
98189819
def->add_action(
9819-
"potion,if=buff.serenity.up|buff.storm_earth_and_fire.up|(!talent.serenity.enabled&trinket.proc.agility."
9820-
"react)|buff.bloodlust.react|target.time_to_die<=60",
9820+
"potion,if=buff.serenity.up|dot.touch_of_death.remains|!talent.serenity.enabled&trinket.proc.agility.react|buff.bloodlust.react|target.time_to_die<=60",
98219821
"Potion if Serenity or Storm, Earth, and Fire are up or you are running serenity and a main stat trinket "
98229822
"procs, or you are under the effect of bloodlust, or target time to die is greater or equal to 60" );
98239823
else
@@ -9831,56 +9831,51 @@ void monk_t::apl_combat_windwalker()
98319831
def->add_action( this, "Reverse Harm",
98329832
"if=(energy.time_to_max<1|(talent.serenity.enabled&cooldown.serenity.remains<2))&chi.max-chi>=2" );
98339833
def->add_talent( this, "Fist of the White Tiger",
9834-
"if=(energy.time_to_max<1|(talent.serenity.enabled&cooldown.serenity.remains<2)|(energy.time_to_max<"
9835-
"4&cooldown.fists_of_fury.remains<1.5))&chi.max-chi>=3" );
9834+
"if=(energy.time_to_max<1|(talent.serenity.enabled&cooldown.serenity.remains<2)|(energy.time_to_max<4&cooldown.fists_of_fury.remains<1.5))&chi.max-chi>=3" );
98369835
def->add_action( this, "Tiger Palm",
9837-
"target_if=min:debuff.mark_of_the_crane.remains,if=!combo_break&(energy.time_to_max<1|(talent."
9838-
"serenity.enabled&cooldown.serenity.remains<2)|(energy.time_to_max<4&cooldown.fists_of_fury.remains<"
9839-
"1.5))&chi.max-chi>=2&!dot.touch_of_death.remains" );
9836+
"target_if=min:debuff.mark_of_the_crane.remains,if=!combo_break&(energy.time_to_max<1|(talent.serenity.enabled&cooldown.serenity.remains<2)|(energy.time_to_max<4&cooldown.fists_of_fury.remains<1.5))&chi.max-chi>=2&!dot.touch_of_death.remains" );
98409837
def->add_talent( this, "Chi Wave", "if=!talent.fist_of_the_white_tiger.enabled&time<=3" );
98419838
def->add_action( "call_action_list,name=cd" );
9842-
def->add_action(
9843-
"call_action_list,name=rskless,if=!ptr&active_enemies<3&azerite.open_palm_strikes.enabled&!azerite.glory_of_the_dawn."
9844-
"enabled",
9845-
"Call the RSKLess action list if Open Palm Strikes' is enabled, and Glory of the Dawm's rank is not enabled" );
98469839
def->add_action( "call_action_list,name=st,if=active_enemies<3",
98479840
"Call the ST action list if there are 2 or less enemies" );
98489841
def->add_action( "call_action_list,name=aoe,if=active_enemies>=3",
98499842
"Call the AoE action list if there are 3 or more enemies" );
98509843

98519844
// Cooldowns
98529845
cd->add_talent( this, "Invoke Xuen, the White Tiger", "", "Cooldowns" );
9853-
cd->add_action( "guardian_of_azeroth" );
9854-
cd->add_action( "worldvein_resonance" );
9846+
cd->add_action( "guardian_of_azeroth,if=target.time_to_die>185|(!equipped.dribbling_inkpod|equipped.cyclotronic_blast|target.health.pct<30)&cooldown.touch_of_death.remains<=14|equipped.dribbling_inkpod&target.time_to_pct_30.remains<20|target.time_to_die<35" );
9847+
cd->add_action( "worldvein_resonance,if=cooldown.touch_of_death.remains>58|cooldown.touch_of_death.remains<2|target.time_to_die<20" );
98559848

98569849
// Racials
98579850
for ( size_t i = 0; i < racial_actions.size(); i++ )
98589851
{
98599852
if ( racial_actions[ i ] == "arcane_torrent" )
98609853
cd->add_action( racial_actions[ i ] + ",if=chi.max-chi>=1&energy.time_to_max>=0.5",
98619854
"Use Arcane Torrent if you are missing at least 1 Chi and won't cap energy within 0.5 seconds" );
9855+
else if ( racial_actions[ i ] == "berserking" )
9856+
cd->add_action( racial_actions[ i ] + ",if=target.time_to_die>183|dot.touch_of_death.remains|target.time_to_die<13",
9857+
"Use Berserking during Touch of Death" );
98629858
else
98639859
cd->add_action( racial_actions[ i ] );
98649860
}
98659861

98669862
cd->add_action( "call_action_list,name=tod" );
9867-
cd->add_action(
9868-
this, "Storm, Earth, and Fire",
9869-
"if=cooldown.storm_earth_and_fire.charges=2|(cooldown.fists_of_fury.remains<=9&chi>=3&cooldown.whirling_dragon_"
9870-
"punch.remains<=14&cooldown.touch_of_death.remains>=90)|target.time_to_die<=15|dot.touch_of_death.remains" );
9863+
cd->add_action( this, "Storm, Earth, and Fire", ",if=cooldown.storm_earth_and_fire.charges=2|(!essence.worldvein_resonance.major|(buff.worldvein_resonance.up|cooldown.worldvein_resonance.remains>cooldown.storm_earth_and_fire.full_recharge_time))&(cooldown.touch_of_death.remains>cooldown.storm_earth_and_fire.full_recharge_time|cooldown.touch_of_death.remains>target.time_to_die)&cooldown.fists_of_fury.remains<=9&chi>=3&cooldown.whirling_dragon_punch.remains<=13|dot.touch_of_death.remains|target.time_to_die<20" );
98719864

98729865
// Essences
9873-
cd->add_action( "concentrated_flame,if=dot.concentrated_flame_burn.remains<=2" );
9874-
cd->add_action( "blood_of_the_enemy" );
9866+
cd->add_action( "blood_of_the_enemy,if=dot.touch_of_death.remains|target.time_to_die<12" );
9867+
cd->add_action( "use_item,if=equipped.cyclotronic_blast&cooldown.cyclotronic_blast.remains<=20|!equipped.cyclotronic_blast" );
9868+
cd->add_action( "ancestral_call,if=dot.touch_of_death.remains|target.time_to_die<16" );
9869+
cd->add_action( "fireblood,if=dot.touch_of_death.remains|target.time_to_die<9" );
9870+
cd->add_action( "concentrated_flame,if=!dot.concentrated_flame_burn.remains&(cooldown.concentrated_flame.remains<=cooldown.touch_of_death.remains&(talent.whirling_dragon_punch.enabled&cooldown.whirling_dragon_punch.remains)&cooldown.rising_sun_kick.remains&cooldown.fists_of_fury.remains&buff.storm_earth_and_fire.down|dot.touch_of_death.remains)|target.time_to_die<8" );
9871+
cd->add_action( "use_item,name=pocketsized_computation_device,if=dot.touch_of_death.remains" );
9872+
cd->add_action( "use_item,name=ashvanes_razor_coral,if=variable.coral_double_tod_on_use&cooldown.touch_of_death.remains>=23&(debuff.razor_coral_debuff.down|buff.storm_earth_and_fire.remains>13|target.time_to_die-cooldown.touch_of_death.remains<40&cooldown.touch_of_death.remains<23|target.time_to_die<25)" );
9873+
cd->add_action( "use_item,name=ashvanes_razor_coral,if=!variable.coral_double_tod_on_use&(debuff.razor_coral_debuff.down|(!equipped.dribbling_inkpod|target.time_to_pct_30.remains<8)&(dot.touch_of_death.remains|cooldown.touch_of_death.remains+9>target.time_to_die&buff.storm_earth_and_fire.up|target.time_to_die<25))" );
98759874
cd->add_action( "the_unbound_force" );
98769875
cd->add_action( "purifying_blast" );
9876+
cd->add_action( "reaping_flames" );
98779877
cd->add_action( "focused_azerite_beam" );
98789878

9879-
cd->add_action( "use_item,name=pocketsized_computation_device,if=dot.touch_of_death.remains" );
9880-
cd->add_action(
9881-
"use_item,name=ashvanes_razor_coral,if=((equipped.cyclotronic_blast&cooldown.cyclotronic_blast.remains>=20)|!"
9882-
"equipped.cyclotronic_blast)&(debuff.razor_coral_debuff.down|(!equipped.dribbling_inkpod|target.time_to_pct_30."
9883-
"remains<8)&buff.storm_earth_and_fire.remains>13|target.time_to_die<21)" );
98849879
cd->add_talent( this, "Serenity", "if=cooldown.rising_sun_kick.remains<=2|target.time_to_die<=12" );
98859880
cd->add_action( "memory_of_lucid_dreams,if=energy<40&buff.storm_earth_and_fire.up" );
98869881
cd->add_action( "ripple_in_space" );
@@ -9913,95 +9908,46 @@ void monk_t::apl_combat_windwalker()
99139908
// cd->add_action( "use_item,name=" + items[ i ].name_str );
99149909
}
99159910
}
9916-
cd->add_action(
9917-
"use_items,if=(equipped.cyclotronic_blast&cooldown.cyclotronic_blast.remains<=20)|!equipped.cyclotronic_blast" );
99189911

99199912
// Touch of Death
9920-
tod->add_action( this, "Touch of Death",
9921-
"if=equipped.cyclotronic_blast&target.time_to_die>9&cooldown.cyclotronic_blast.remains<=2" );
9922-
tod->add_action( this, "Touch of Death",
9923-
"if=!equipped.cyclotronic_blast&equipped.dribbling_inkpod&target.time_to_die>9&(target.time_to_pct_"
9924-
"30.remains>=130|target.time_to_pct_30.remains<8)" );
9925-
tod->add_action( this, "Touch of Death",
9926-
"if=!equipped.cyclotronic_blast&!equipped.dribbling_inkpod&target.time_to_die>9" );
9913+
tod->add_action( this, "Touch of Death", "if=equipped.cyclotronic_blast&target.time_to_die>9&cooldown.cyclotronic_blast.remains<=1" );
9914+
tod->add_action( this, "Touch of Death", "if=!equipped.cyclotronic_blast&equipped.dribbling_inkpod&target.time_to_die>9&(target.time_to_pct_30.remains>=130|target.time_to_pct_30.remains<8)" );
9915+
tod->add_action( this, "Touch of Death", "if=!equipped.cyclotronic_blast&!equipped.dribbling_inkpod&target.time_to_die>9" );
99279916

99289917
// Serenity
9929-
serenity->add_action(
9930-
this, "Rising Sun Kick",
9931-
"target_if=min:debuff.mark_of_the_crane.remains,if=active_enemies<3|prev_gcd.1.spinning_crane_kick",
9932-
"Serenity priority" );
9933-
serenity->add_action(
9934-
this, "Fists of Fury",
9935-
"if=(buff.bloodlust.up&prev_gcd.1.rising_sun_kick)|buff.serenity.remains<1|(active_enemies>1&active_enemies<5)" );
9936-
serenity->add_talent(
9937-
this, "Fist of the White Tiger",
9938-
"if=talent.hit_combo.enabled&energy.time_to_max<2&prev_gcd.1.blackout_kick&chi<=2" );
9939-
serenity->add_action(
9940-
this, "Tiger Palm",
9941-
"if=talent.hit_combo.enabled&energy.time_to_max<1&prev_gcd.1.blackout_kick&chi.max-chi>=2" );
9942-
serenity->add_action( this, "Spinning Crane Kick",
9943-
"if=combo_strike&(active_enemies>=3|(talent.hit_combo.enabled&prev_gcd.1.blackout_kick)|(active_enemies=2&prev_gcd.1.blackout_kick))" );
9918+
serenity->add_action( this, "Rising Sun Kick", "target_if=min:debuff.mark_of_the_crane.remains,if=active_enemies<3|prev_gcd.1.spinning_crane_kick", "Serenity priority" );
9919+
serenity->add_action( this, "Fists of Fury", "if=(buff.bloodlust.up&prev_gcd.1.rising_sun_kick)|buff.serenity.remains<1|(active_enemies>1&active_enemies<5)" );
9920+
serenity->add_talent( this, "Fist of the White Tiger", "if=talent.hit_combo.enabled&energy.time_to_max<2&prev_gcd.1.blackout_kick&chi<=2" );
9921+
serenity->add_action( this, "Tiger Palm", "if=talent.hit_combo.enabled&energy.time_to_max<1&prev_gcd.1.blackout_kick&chi.max-chi>=2" );
9922+
serenity->add_action( this, "Spinning Crane Kick", "if=combo_strike&(active_enemies>=3|(talent.hit_combo.enabled&prev_gcd.1.blackout_kick)|(active_enemies=2&prev_gcd.1.blackout_kick))" );
99449923
serenity->add_action( this, "Blackout Kick", "target_if=min:debuff.mark_of_the_crane.remains" );
99459924

99469925
// Multiple Targets
9947-
aoe->add_action( this, "Rising Sun Kick",
9948-
"target_if=min:debuff.mark_of_the_crane.remains,if=(talent.whirling_dragon_punch.enabled&cooldown."
9949-
"whirling_dragon_punch.remains<5)&cooldown.fists_of_fury.remains>3",
9950-
"Actions.AoE is intended for use with Hectic_Add_Cleave and currently needs to be optimized" );
9926+
aoe->add_action( this, "Rising Sun Kick", "target_if=min:debuff.mark_of_the_crane.remains,if=(talent.whirling_dragon_punch.enabled&cooldown.whirling_dragon_punch.remains<5)&cooldown.fists_of_fury.remains>3", "Actions.AoE is intended for use with Hectic_Add_Cleave and currently needs to be optimized" );
99519927
aoe->add_talent( this, "Whirling Dragon Punch" );
99529928
aoe->add_talent( this, "Energizing Elixir", "if=!prev_gcd.1.tiger_palm&chi<=1&energy<50" );
99539929
aoe->add_action( this, "Fists of Fury", "if=energy.time_to_max>3" );
99549930
aoe->add_talent( this, "Rushing Jade Wind", "if=buff.rushing_jade_wind.down" );
9955-
aoe->add_action( this, "Spinning Crane Kick",
9956-
"if=combo_strike&(((chi>3|cooldown.fists_of_fury.remains>6)&(chi>=5|cooldown.fists_of_fury.remains>"
9957-
"2))|energy.time_to_max<=3)" );
9931+
aoe->add_action( this, "Spinning Crane Kick", "if=combo_strike&(((chi>3|cooldown.fists_of_fury.remains>6)&(chi>=5|cooldown.fists_of_fury.remains>2))|energy.time_to_max<=3)" );
99589932
aoe->add_action( this, "Reverse Harm", "if=chi.max-chi>=2" );
99599933
aoe->add_talent( this, "Chi Burst", "if=chi<=3" );
99609934
aoe->add_talent( this, "Fist of the White Tiger", "if=chi.max-chi>=3" );
9961-
aoe->add_action(
9962-
this, "Tiger Palm",
9963-
"target_if=min:debuff.mark_of_the_crane.remains,if=chi.max-chi>=2&(!talent.hit_combo.enabled|!combo_break)" );
9935+
aoe->add_action( this, "Tiger Palm", "target_if=min:debuff.mark_of_the_crane.remains,if=chi.max-chi>=2&(!talent.hit_combo.enabled|!combo_break)" );
99649936
aoe->add_talent( this, "Chi Wave", "if=!combo_break" );
99659937
aoe->add_action( this, "Flying Serpent Kick", "if=buff.bok_proc.down,interrupt=1" );
9966-
aoe->add_action( this, "Blackout Kick",
9967-
"target_if=min:debuff.mark_of_the_crane.remains,if=combo_strike&(buff.bok_proc.up|(talent.hit_combo."
9968-
"enabled&prev_gcd.1.tiger_palm&chi<4))" );
9969-
9970-
// RSK-less Target
9971-
rskless->add_talent( this, "Whirling Dragon Punch" );
9972-
rskless->add_action( this, "Fists of Fury" );
9973-
rskless->add_action( this, "Rising Sun Kick",
9974-
"target_if=min:debuff.mark_of_the_crane.remains,if=buff.storm_earth_and_fire.up|cooldown."
9975-
"whirling_dragon_punch.remains<4" );
9976-
rskless->add_talent( this, "Rushing Jade Wind", "if=buff.rushing_jade_wind.down&active_enemies>1" );
9977-
rskless->add_action( this, "Reverse Harm", "if=chi.max-chi>=2" );
9978-
rskless->add_talent( this, "Fist of the White Tiger", "if=chi<=2" );
9979-
rskless->add_talent( this, "Energizing Elixir", "if=chi<=3&energy<50" );
9980-
rskless->add_action( this, "Spinning Crane Kick", "if=combo_strike&buff.dance_of_chiji.react" );
9981-
rskless->add_action( this, "Blackout Kick",
9982-
"target_if=min:debuff.mark_of_the_crane.remains,if=combo_strike&(cooldown.fists_of_fury.remains>"
9983-
"4|chi>=4|(chi=2&prev_gcd.1.tiger_palm))" );
9984-
rskless->add_talent( this, "Chi Wave" );
9985-
rskless->add_talent( this, "Chi Burst", "if=chi.max-chi>=1&active_enemies=1|chi.max-chi>=2" );
9986-
rskless->add_action( this, "Flying Serpent Kick", "if=prev_gcd.1.blackout_kick&chi>3,interrupt=1" );
9987-
rskless->add_action( this, "Rising Sun Kick", "target_if=min:debuff.mark_of_the_crane.remains,if=chi.max-chi<2" );
9988-
rskless->add_action( this, "Tiger Palm",
9989-
"target_if=min:debuff.mark_of_the_crane.remains,if=combo_strike&chi.max-chi>=2" );
9990-
rskless->add_action( this, "Rising Sun Kick", "target_if=min:debuff.mark_of_the_crane.remains" );
9938+
aoe->add_action( this, "Blackout Kick", "target_if=min:debuff.mark_of_the_crane.remains,if=combo_strike&(buff.bok_proc.up|(talent.hit_combo.enabled&prev_gcd.1.tiger_palm&chi<4))" );
99919939

99929940
// Single Target
99939941
st->add_talent( this, "Whirling Dragon Punch" );
9994-
st->add_action( this, "Rising Sun Kick", "target_if=min:debuff.mark_of_the_crane.remains,if=chi>=5" );
99959942
st->add_action( this, "Fists of Fury", "if=energy.time_to_max>3" );
9943+
st->add_action( this, "Rising Sun Kick", "target_if=min:debuff.mark_of_the_crane.remains,if=chi>=5" );
99969944
st->add_action( this, "Rising Sun Kick", "target_if=min:debuff.mark_of_the_crane.remains" );
99979945
st->add_talent( this, "Rushing Jade Wind", "if=buff.rushing_jade_wind.down&active_enemies>1" );
99989946
st->add_action( this, "Reverse Harm", "if=chi.max-chi>=2" );
99999947
st->add_talent( this, "Fist of the White Tiger", "if=chi<=2" );
100009948
st->add_talent( this, "Energizing Elixir", "if=chi<=3&energy<50" );
100019949
st->add_action( this, "Spinning Crane Kick", "if=combo_strike&buff.dance_of_chiji.react" );
10002-
st->add_action( this, "Blackout Kick",
10003-
"target_if=min:debuff.mark_of_the_crane.remains,if=combo_strike&(cooldown.rising_sun_kick.remains>3|"
10004-
"chi>=3)&(cooldown.fists_of_fury.remains>4|chi>=4|(chi=2&prev_gcd.1.tiger_palm))" );
9950+
st->add_action( this, "Blackout Kick", "target_if=min:debuff.mark_of_the_crane.remains,if=combo_strike&(cooldown.rising_sun_kick.remains>3|chi>=3)&(cooldown.fists_of_fury.remains>4|chi>=4|(chi=2&prev_gcd.1.tiger_palm))" );
100059951
st->add_talent( this, "Chi Wave" );
100069952
st->add_talent( this, "Chi Burst", "if=chi.max-chi>=1&active_enemies=1|chi.max-chi>=2" );
100079953
st->add_action( this, "Tiger Palm", "target_if=min:debuff.mark_of_the_crane.remains,if=combo_strike&chi.max-chi>=2" );

0 commit comments

Comments
 (0)