diff --git a/engine/class_modules/apl/warlock.cpp b/engine/class_modules/apl/warlock.cpp index 5c58d6ab271..7d95db80376 100644 --- a/engine/class_modules/apl/warlock.cpp +++ b/engine/class_modules/apl/warlock.cpp @@ -28,7 +28,7 @@ namespace warlock_apl{ switch ( p->specialization() ) { - case WARLOCK_AFFLICTION: lvl90_flask = "flask_of_the_blood_knights_2"; break; + case WARLOCK_AFFLICTION: lvl90_flask = "flask_of_the_shattered_sun_2"; break; case WARLOCK_DEMONOLOGY: lvl90_flask = "flask_of_the_shattered_sun_2"; break; case WARLOCK_DESTRUCTION: lvl90_flask = "flask_of_the_magisters_2"; break; default: break; @@ -81,6 +81,7 @@ void affliction( player_t* p ) precombat->add_action( "grimoire_of_sacrifice,if=talent.grimoire_of_sacrifice" ); precombat->add_action( "seed_of_corruption,if=(hero_tree.soul_harvester&active_enemies>1)|active_enemies>2" ); precombat->add_action( "haunt,if=active_enemies<2|(hero_tree.hellcaller&active_enemies<3)" ); + precombat->add_action( "potion,if=potion.liquid_luster" ); default_->add_action( "call_action_list,name=variables" ); default_->add_action( "call_action_list,name=end_of_fight" ); @@ -100,10 +101,10 @@ void affliction( player_t* p ) hellcaller->add_action( "call_action_list,name=HC_cleave,if=active_enemies=2" ); hellcaller->add_action( "call_action_list,name=HC_aoe,if=active_enemies>2" ); - items->add_action( "use_item,name=stormbound_emblem_of_dazar,if=cooldown.summon_darkglare.remains<=2&dot.agony.remains&(dot.corruption.remains|dot.wither.remains)&cooldown.dark_harvest.remains>1" ); + items->add_action( "use_item,name=stormbound_emblem_of_dazar,if=cooldown.summon_darkglare.remains<=4&dot.agony.remains&(dot.corruption.remains|dot.wither.remains)&cooldown.dark_harvest.remains>1" ); items->add_action( "use_item,name=galactic_gladiators_badge_of_ferocity,if=(buff.malevolence.up|pet.darkglare.active)|fight_remains<20" ); - items->add_action( "use_items,if=(buff.malevolence.up|pet.darkglare.active)|fight_remains<20" ); items->add_action( "use_item,name=hex_lords_dooming_idol,if=pet.darkglare.active|buff.hex_lords_doom.stack>19|fight_remains<=30" ); + items->add_action( "use_items,if=(buff.malevolence.up|pet.darkglare.active)|fight_remains<20" ); items->add_action( "use_item,use_off_gcd=1,slot=main_hand" ); ogcd->add_action( "potion,use_off_gcd=1,if=variable.cds_active|fight_remains<32" ); @@ -127,11 +128,12 @@ void affliction( player_t* p ) SH_aoe->add_action( "seed_of_corruption,if=(!dot.corruption.ticking|dot.corruption.refreshable)&!dot.seed_of_corruption.ticking&!prev.seed_of_corruption&!action.seed_of_corruption.in_flight" ); SH_aoe->add_action( "dark_harvest" ); SH_aoe->add_action( "seed_of_corruption,target_if=!dot.unstable_affliction.ticking&prev.dark_harvest,if=set_bonus.midnight_season_2_4pc&active_enemies<=5" ); - SH_aoe->add_action( "agony,target_if=min:remains,if=active_dot.agony<10&remains<5" ); + SH_aoe->add_action( "agony,target_if=min:remains,if=active_dot.agony<12&remains<5" ); SH_aoe->add_action( "summon_darkglare" ); SH_aoe->add_action( "malefic_grasp,if=buff.nightfall.react>1&active_enemies<=6" ); SH_aoe->add_action( "shadow_bolt,if=buff.nightfall.react>1&active_enemies<=7" ); - SH_aoe->add_action( "seed_of_corruption" ); + SH_aoe->add_action( "seed_of_corruption,if=talent.sow_the_seeds|active_enemies>5" ); + SH_aoe->add_action( "unstable_affliction" ); SH_aoe->add_action( "agony,target_if=min:remains,if=remainsadd_action( "malefic_grasp,if=pet.darkglare.remainsadd_action( "agony,target_if=refreshable" ); SH_cleave->add_action( "dark_harvest" ); SH_cleave->add_action( "unstable_affliction,cycle_targets=1,if=!ticking&prev.dark_harvest" ); - SH_cleave->add_action( "seed_of_corruption,if=talent.sow_the_seeds" ); SH_cleave->add_action( "unstable_affliction" ); SH_cleave->add_action( "summon_darkglare" ); SH_cleave->add_action( "malefic_grasp,if=buff.nightfall.react>1|pet.darkglare.remainsadd_action( "haunt" ); HC_aoe->add_action( "seed_of_corruption,if=(!dot.wither.ticking|dot.wither.refreshable)&!dot.seed_of_corruption.ticking&!prev.seed_of_corruption&!action.seed_of_corruption.in_flight" ); HC_aoe->add_action( "dark_harvest" ); - HC_aoe->add_action( "agony,target_if=min:remains,if=active_dot.agony<(8+(2*talent.sow_the_seeds))&remains<5" ); + HC_aoe->add_action( "agony,target_if=min:remains,if=active_dot.agony<14&remains<5" ); HC_aoe->add_action( "summon_darkglare" ); HC_aoe->add_action( "malevolence" ); HC_aoe->add_action( "seed_of_corruption,if=talent.sow_the_seeds|active_enemies>5" ); @@ -187,6 +188,8 @@ void affliction( player_t* p ) variables->add_action( "variable,name=cds_active,op=set,value=!talent.summon_darkglare|pet.darkglare.remains" ); variables->add_action( "variable,name=darkglare_active,op=set,value=pet.darkglare.active|(cooldown.summon_darkglare.duration-cooldown.summon_darkglare.remains)<20" ); variables->add_action( "cycling_variable,name=min_agony,op=min,value=dot.agony.remains+(99*!dot.agony.remains)" ); + variables->add_action( "variable,name=malevolence_from_cast,value=0,op=set,if=buff.malevolence.up=0" ); + variables->add_action( "variable,name=malevolence_from_cast,value=1,op=set,if=prev_gcd.1.malevolence" ); } //affliction_apl_end diff --git a/profiles/generators/MID2/MID2_Generate_Warlock.simc b/profiles/generators/MID2/MID2_Generate_Warlock.simc index 31f0ddc651c..fdf9951063e 100644 --- a/profiles/generators/MID2/MID2_Generate_Warlock.simc +++ b/profiles/generators/MID2/MID2_Generate_Warlock.simc @@ -4,28 +4,28 @@ level=90 race=troll role=spell position=ranged_back -talents=CkQAAAAAAAAAAAAAAAAAAAAAAwMzMzoZhhZmZmlBAAYmZZ2mZmlxAAjllBGwEMDbBG2GAAAmBAAwMDzMjBzwMzMzMGMzMzAAmBG -omnium_talents=136822:1/136816:1/136817:1/136815:1/136814:1 +talents=CkQAAAAAAAAAAAAAAAAAAAAAAwMzMzoZhhZmZmlBAAYmZZ2mZmFzAAjllBGwEMDbBG2GAAAmBAAwMDzMjBzwMzMzMGMzMzAAGwA +omnium_talents=136822:1/136819:1/136817:1/136820:1/136814:1 warlock.default_pet=sayaad -flask=flask_of_the_blood_knights_2 +flask=flask_of_the_shattered_sun_2 potion=liquid_luster_2 -head=venomkeepers_horrific_cowl,id=271874,enchant_id=7961,gem_id=240967,bonus_id=13846/40/13696/13663/13335/13848/13695,content_tuning=883 -neck=aqirbane_reliquary,id=268265,gem_id=240890/240890,bonus_id=13708/13668/40/13335/13848,content_tuning=883 -shoulder=spires_of_the_damned_necrolyte,id=271544,enchant_id=8001,bonus_id=13694/13697,redirected_base_stats=239031,ilevel=334 -back=silken_voodoo_drape,id=268253,ilevel=344 -chest=damned_necrolytes_rattling_robes,id=271549,enchant_id=7987,bonus_id=13690/13698/12854,redirected_base_stats=251139 -wrist=martyrs_bindings,id=239648,gem_id=240890,bonus_id=12214/12384/8960/13750/8790,ilevel=331 -hands=damned_necrolytes_charred_grasps,id=271547,bonus_id=13691/13697/13848,redirected_base_stats=268243 -waist=ethereal_netherwrap,id=251222,gem_id=240890,bonus_id=12854/13662/13750 -legs=damned_necrolytes_leg_bindings,id=271545,enchant_id=7935,bonus_id=13693/13698/12854,redirected_base_stats=251160 -feet=cackling_soultreads,id=268255,enchant_id=7993,ilevel=344 -finger1=band_of_the_amani_warlord,id=273792,enchant_id=7967,gem_id=240890,bonus_id=13668/12854/13662 -finger2=apex_brutes_claw_ring,id=268252,enchant_id=7967,gem_id=240890,bonus_id=13668/12854/13662 -trinket1=vexhuls_everflowing_gland,id=270170,bonus_id=12854/13662 -trinket2=font_of_venomous_rage,id=270168,bonus_id=13848/13662 -main_hand=janthrazet_the_soul_fang,id=271092,enchant_id=8039,bonus_id=40/13335/13848,content_tuning=883 -off_hand=alnhara_lantern,id=245769,bonus_id=13836/13751/9627/13771/8960,crafted_stats=32/36,crafting_quality=5 +head=,id=271874,enchant_id=7961,gem_id=240967,bonus_id=13846/40/13696/13663/13335/13848/13695,content_tuning=883 +neck=,id=268265,gem_id=240902/240894,bonus_id=13987/13668/13848/13662 +shoulder=,id=271544,enchant_id=8001,bonus_id=13694/13697,redirected_base_stats=239031,ilevel=334 +back=,id=268253,ilevel=344 +chest=,id=271549,enchant_id=7987,bonus_id=13690/13698/12854,redirected_base_stats=251139 +wrist=,id=239648,gem_id=240914,bonus_id=12214/12384/8960/13750/8790,ilevel=331 +hands=,id=271547,bonus_id=13691/13697/13848,redirected_base_stats=268243 +waist=,id=251222,gem_id=240914,bonus_id=12854/13662/13750 +legs=,id=271545,enchant_id=7935,bonus_id=13693/13698/12854,redirected_base_stats=251160 +feet=,id=268255,enchant_id=7993,ilevel=344 +finger1=,id=273792,enchant_id=7967,gem_id=240914,bonus_id=13668/12854/13662 +finger2=,id=268252,enchant_id=7967,gem_id=240910,bonus_id=13668/12854/13662 +trinket1=,id=270170,bonus_id=12854/13662 +trinket2=,id=273649,bonus_id=12854/13662 +main_hand=,id=271092,enchant_id=8689,bonus_id=40/13335/13848,content_tuning=883 +off_hand=,id=245769,bonus_id=13836/13751/9627/13771/8960,crafted_stats=32/36,crafting_quality=5 save=MID2_Warlock_Affliction.simc @@ -35,28 +35,28 @@ level=90 race=troll role=spell position=ranged_back -talents=CkQAAAAAAAAAAAAAAAAAAAAAAwMzMzoZhhZmZmlBAAYmZZWmZmlxAAWgBmFjGzAysBWGAAAmBAAmZAzMjBzwMjZmZGMzMzAAmBG -omnium_talents=136822:1/136816:1/136817:1/136815:1/136814:1 +talents=CkQAAAAAAAAAAAAAAAAAAAAAAwMzMzoZhhZmZmlBAAYmZZWmZmlxAAWgBmFjGzAysBWGAAAmBAAmZAzMjxYGmZMzMGMzMzAAmBG +omnium_talents=136822:1/136819:1/136817:1/136815:1/136814:1 warlock.default_pet=sayaad flask=flask_of_the_blood_knights_2 potion=liquid_luster_2 -head=venomkeepers_horrific_cowl,id=271874,enchant_id=7961,gem_id=240967,bonus_id=13846/40/13696/13663/13335/13848/13695,content_tuning=883 -neck=aqirbane_reliquary,id=268265,gem_id=240890/240890,bonus_id=13708/13668/40/13335/13848,content_tuning=883 -shoulder=spires_of_the_damned_necrolyte,id=271544,enchant_id=8001,bonus_id=13694/13697,redirected_base_stats=239031,ilevel=334 -back=silken_voodoo_drape,id=268253,ilevel=344 -chest=damned_necrolytes_rattling_robes,id=271549,enchant_id=7987,bonus_id=13690/13698/12854,redirected_base_stats=251139 -wrist=martyrs_bindings,id=239648,gem_id=240890,bonus_id=12214/12384/8960/13750/8790,ilevel=331 -hands=damned_necrolytes_charred_grasps,id=271547,bonus_id=13691/13697/13848,redirected_base_stats=268243 -waist=ethereal_netherwrap,id=251222,gem_id=240890,bonus_id=12854/13662/13750 -legs=damned_necrolytes_leg_bindings,id=271545,enchant_id=7935,bonus_id=13693/13698/12854,redirected_base_stats=251160 -feet=cackling_soultreads,id=268255,enchant_id=7993,ilevel=344 -finger1=band_of_the_amani_warlord,id=273792,enchant_id=7967,gem_id=240890,bonus_id=13668/12854/13662 -finger2=apex_brutes_claw_ring,id=268252,enchant_id=7967,gem_id=240890,bonus_id=13668/12854/13662 -trinket1=vexhuls_everflowing_gland,id=270170,bonus_id=12854/13662 -trinket2=font_of_venomous_rage,id=270168,bonus_id=13848/13662 -main_hand=janthrazet_the_soul_fang,id=271092,enchant_id=8039,bonus_id=40/13335/13848,content_tuning=883 -off_hand=alnhara_lantern,id=245769,bonus_id=13836/13751/9627/13771/8960,crafted_stats=32/36,crafting_quality=5 +head=,id=271874,enchant_id=7961,gem_id=240967,bonus_id=13846/40/13696/13663/13335/13848/13695,content_tuning=883 +neck=,id=268265,gem_id=240902/240894,bonus_id=13987/13668/13848/13662 +shoulder=,id=271544,enchant_id=8001,bonus_id=13694/13697,redirected_base_stats=239031,ilevel=334 +back=,id=268253,ilevel=344 +chest=,id=271549,enchant_id=7987,bonus_id=13690/13698/12854,redirected_base_stats=251139 +wrist=,id=239648,gem_id=240914,bonus_id=12214/12384/8960/13750/8790,ilevel=331 +hands=,id=271547,bonus_id=13691/13697/13848,redirected_base_stats=268243 +waist=,id=251222,gem_id=240914,bonus_id=12854/13662/13750 +legs=,id=271545,enchant_id=7935,bonus_id=13693/13698/12854,redirected_base_stats=251160 +feet=,id=268255,enchant_id=7993,ilevel=344 +finger1=,id=273792,enchant_id=7967,gem_id=240914,bonus_id=13668/12854/13662 +finger2=,id=268252,enchant_id=7967,gem_id=240910,bonus_id=13668/12854/13662 +trinket1=,id=270167,bonus_id=12854/13662 +trinket2=,id=270169,bonus_id=13848/13662 +main_hand=,id=271092,enchant_id=8689,bonus_id=40/13335/13848,content_tuning=883 +off_hand=,id=245769,bonus_id=13836/13751/9627/13771/8960,crafted_stats=32/36,crafting_quality=5 save=MID2_Warlock_Affliction_Hellcaller.simc