Skip to content

Commit

Permalink
Assorted rechecks of numbers and talents.
Browse files Browse the repository at this point in the history
  • Loading branch information
Hekili committed Jan 16, 2024
1 parent c60a206 commit 0d2ecb5
Show file tree
Hide file tree
Showing 21 changed files with 426 additions and 399 deletions.
6 changes: 3 additions & 3 deletions Dragonflight/APLs/WarriorArms.simc
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ actions.execute+=/sweeping_strikes,if=active_enemies>1
actions.execute+=/mortal_strike,if=dot.rend.remains<=gcd&talent.bloodletting
actions.execute+=/rend,if=remains<=gcd&!talent.bloodletting&(!talent.warbreaker&cooldown.colossus_smash.remains<4|talent.warbreaker&cooldown.warbreaker.remains<4)&target.time_to_die>12
actions.execute+=/avatar,if=cooldown.colossus_smash.ready|debuff.colossus_smash.up|target.time_to_die<20
actions.execute+=/spear_of_bastion,if=cooldown.colossus_smash.remains<=gcd
actions.execute+=/champions_spear,if=cooldown.colossus_smash.remains<=gcd
actions.execute+=/warbreaker,if=raid_event.adds.in>22
actions.execute+=/colossus_smash
actions.execute+=/execute,if=buff.sudden_death.react&dot.deep_wounds.remains
Expand Down Expand Up @@ -62,7 +62,7 @@ actions.aoe+=/execute,if=buff.sudden_death.react&set_bonus.tier31_4pc
actions.aoe+=/cleave,if=buff.martial_prowess.stack=2
actions.aoe+=/mortal_strike,if=talent.sharpened_blades&buff.sweeping_strikes.up&buff.martial_prowess.stack=2&active_enemies<=8
actions.aoe+=/thunderous_roar,if=buff.test_of_might.up|debuff.colossus_smash.up|dot.deep_wounds.remains
actions.aoe+=/spear_of_bastion,if=buff.test_of_might.up|debuff.colossus_smash.up|dot.deep_wounds.remains
actions.aoe+=/champions_spear,if=buff.test_of_might.up|debuff.colossus_smash.up|dot.deep_wounds.remains
actions.aoe+=/bladestorm,if=buff.hurricane.remains<3|!talent.hurricane
actions.aoe+=/whirlwind,if=talent.storm_of_swords
actions.aoe+=/cleave,if=!talent.fervor_of_battle|talent.fervor_of_battle&dot.deep_wounds.remains<=dot.deep_wounds.duration*0.3
Expand Down Expand Up @@ -91,7 +91,7 @@ actions.single_target+=/mortal_strike
actions.single_target+=/thunder_clap,if=dot.rend.remains<=gcd&talent.blood_and_thunder
actions.single_target+=/whirlwind,if=talent.storm_of_swords&debuff.colossus_smash.up
actions.single_target+=/bladestorm,if=talent.hurricane&(buff.test_of_might.up|!talent.test_of_might&debuff.colossus_smash.up)&buff.hurricane.remains<2|talent.unhinged&(buff.test_of_might.up|!talent.test_of_might&debuff.colossus_smash.up)
actions.single_target+=/spear_of_bastion,if=buff.test_of_might.up|debuff.colossus_smash.up
actions.single_target+=/champions_spear,if=buff.test_of_might.up|debuff.colossus_smash.up
actions.single_target+=/skullsplitter
actions.single_target+=/execute,if=buff.sudden_death.react
actions.single_target+=/shockwave,if=talent.sonic_boom.enabled
Expand Down
6 changes: 3 additions & 3 deletions Dragonflight/APLs/WarriorFury.simc
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ actions+=/blood_fury
actions+=/fireblood
actions+=/ancestral_call
actions+=/avatar,if=talent.titans_torment&buff.enrage.up&raid_event.adds.in>15&!buff.avatar.up&(!talent.odyns_fury|cooldown.odyns_fury.remains)|talent.berserkers_torment&buff.enrage.up&!buff.avatar.up&raid_event.adds.in>15|!talent.titans_torment&!talent.berserkers_torment&(buff.recklessness.up|target.time_to_die<20)
actions+=/recklessness,if=!raid_event.adds.exists&(talent.annihilator&cooldown.spear_of_bastion.remains<1|cooldown.avatar.remains>40|!talent.avatar|target.time_to_die<12)
actions+=/recklessness,if=!raid_event.adds.exists&(talent.annihilator&cooldown.champions_spear.remains<1|cooldown.avatar.remains>40|!talent.avatar|target.time_to_die<12)
actions+=/recklessness,if=!raid_event.adds.exists&!talent.annihilator|target.time_to_die<12
actions+=/spear_of_bastion,if=buff.enrage.up&((buff.furious_bloodthirst.up&talent.titans_torment)|!talent.titans_torment|target.time_to_die<20|active_enemies>1|!set_bonus.tier31_2pc)&raid_event.adds.in>15
actions+=/champions_spear,if=buff.enrage.up&((buff.furious_bloodthirst.up&talent.titans_torment)|!talent.titans_torment|target.time_to_die<20|active_enemies>1|!set_bonus.tier31_2pc)&raid_event.adds.in>15
actions+=/run_action_list,name=multi_target,strict=1,if=active_enemies>=2
actions+=/run_action_list,name=single_target,strict=1,if=active_enemies=1

Expand Down Expand Up @@ -67,7 +67,7 @@ actions.single_target+=/execute,if=buff.ashen_juggernaut.up&buff.ashen_juggernau
actions.single_target+=/odyns_fury,if=(buff.enrage.up&(spell_targets.whirlwind>1|raid_event.adds.in>15)&(talent.dancing_blades&buff.dancing_blades.remains<5|!talent.dancing_blades))
actions.single_target+=/rampage,if=talent.anger_management&(buff.recklessness.up|buff.enrage.remains<gcd|rage.pct>85)
actions.single_target+=/bloodbath,if=set_bonus.tier30_4pc&action.bloodthirst.crit_pct_current>=95
actions.single_target+=/bloodthirst,if=(set_bonus.tier30_4pc&action.bloodthirst.crit_pct_current>=95)|(!talent.reckless_abandon&buff.furious_bloodthirst.up&buff.enrage.up&(!dot.gushing_wound.remains|buff.elysian_might.up))
actions.single_target+=/bloodthirst,if=(set_bonus.tier30_4pc&action.bloodthirst.crit_pct_current>=95)|(!talent.reckless_abandon&buff.furious_bloodthirst.up&buff.enrage.up&(!dot.gushing_wound.remains|buff.champions_might.up))
actions.single_target+=/bloodbath,if=set_bonus.tier31_2pc
actions.single_target+=/thunderous_roar,if=buff.enrage.up&(buff.avatar.up|!talent.avatar&!talent.titans_torment)&(spell_targets.whirlwind>1|raid_event.adds.in>15)
actions.single_target+=/onslaught,if=buff.enrage.up|talent.tenderize
Expand Down
2 changes: 1 addition & 1 deletion Dragonflight/APLs/WarriorProtection.simc
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ actions+=/last_stand,if=talent.unnerving_focus&(target.health.pct>=90|target.hea
actions+=/rallying_cry
actions+=/ravager
actions+=/demoralizing_shout,if=talent.booming_voice.enabled
actions+=/spear_of_bastion
actions+=/champions_spear
actions+=/thunderous_roar
actions+=/shield_slam,if=buff.fervid.up
actions+=/shockwave,if=talent.sonic_boom.enabled&buff.avatar.up&talent.unstoppable_force.enabled&!talent.rumbling_earth.enabled|talent.sonic_boom.enabled&talent.rumbling_earth.enabled&spell_targets.shockwave>=3
Expand Down
2 changes: 1 addition & 1 deletion Dragonflight/EvokerAugmentation.lua
Original file line number Diff line number Diff line change
Expand Up @@ -731,7 +731,7 @@ spec:RegisterAbilities( {
chrono_loop = {
id = 383005,
cast = 0.0,
cooldown = 60.0,
cooldown = 45.0,
gcd = "spell",

spend = 0.020,
Expand Down
2 changes: 1 addition & 1 deletion Dragonflight/EvokerDevastation.lua
Original file line number Diff line number Diff line change
Expand Up @@ -826,7 +826,7 @@ spec:RegisterAbilities( {
school = "fire",
color = "red",

spend = 0.10,
spend = 0.014,
spendType = "mana",

talent = "cauterizing_flame",
Expand Down
16 changes: 8 additions & 8 deletions Dragonflight/EvokerPreservation.lua
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ spec:RegisterAbilities( {
cooldown = 60,
gcd = "spell",

spend = 0.01,
spend = 0.014,
spendType = "mana",

startsCombat = false,
Expand Down Expand Up @@ -535,7 +535,7 @@ spec:RegisterAbilities( {
gcd = "off",
icd = 0.5,

spend = 0.04,
spend = 0.049,
spendType = "mana",

startsCombat = false,
Expand Down Expand Up @@ -688,7 +688,7 @@ spec:RegisterAbilities( {
cooldown = 8,
gcd = "spell",

spend = 0.01,
spend = 0.014,
spendType = "mana",

startsCombat = false,
Expand Down Expand Up @@ -745,7 +745,7 @@ spec:RegisterAbilities( {
recharge = 9,
gcd = "spell",

spend = 0.02,
spend = 0.028,
spendType = "mana",

startsCombat = false,
Expand All @@ -765,7 +765,7 @@ spec:RegisterAbilities( {
recharge = function() return talent.temporal_artificer.enabled and 180 or 240 end,
gcd = "spell",

spend = 0.05,
spend = 0.055,
spendType = "mana",

startsCombat = false,
Expand All @@ -785,7 +785,7 @@ spec:RegisterAbilities( {
gcd = "off",
icd = 0.5,

spend = 0.04,
spend = 0.042,
spendType = "mana",

startsCombat = false,
Expand Down Expand Up @@ -861,7 +861,7 @@ spec:RegisterAbilities( {
cooldown = 60,
gcd = "off",

spend = 0.02,
spend = 0.022,
spendType = "mana",

startsCombat = false,
Expand All @@ -882,7 +882,7 @@ spec:RegisterAbilities( {
color = "green",
icd = 0.5,

spend = 0.03,
spend = 0.033,
spendType = "mana",

talent = "verdant_embrace",
Expand Down
4 changes: 2 additions & 2 deletions Dragonflight/MonkBrewmaster.lua
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ spec:RegisterTalents( {
chi_torpedo = { 80685, 115008, 1 }, -- Torpedoes you forward a long distance and increases your movement speed by 30% for 10 sec, stacking up to 2 times.
chi_wave = { 80709, 115098, 1 }, -- A wave of Chi energy flows through friends and foes, dealing 327 Nature damage or 900 healing. Bounces up to 7 times to targets within 25 yards.
close_to_heart = { 80707, 389574, 2 }, -- You and your allies within 10 yards have 2% increased healing taken from all sources.
dampen_harm = { 80704, 122278, 1 }, -- Reduces all damage you take by 20% to 50% for 10 sec, with larger attacks being reduced by more.
dance_of_the_wind = { 80704, 414132, 1 }, -- Your dodge chance is increased by 10%.
diffuse_magic = { 80697, 122783, 1 }, -- Reduces magic damage you take by 60% for 6 sec, and transfers all currently active harmful magical effects on you back to their original caster if possible.
disable = { 80679, 116095, 1 }, -- Reduces the target's movement speed by 50% for 15 sec, duration refreshed by your melee attacks.
elusive_mists = { 80603, 388681, 2 }, -- Reduces all damage taken while channelling Soothing Mists by 0%.
Expand Down Expand Up @@ -78,6 +76,8 @@ spec:RegisterTalents( {
chi_surge = { 80718, 393400, 1 }, -- Triggering a bonus attack from Press the Advantage or casting Weapons of Order releases a surge of chi at your target's location, dealing Nature damage split evenly between all targets over 8 sec. Press the Advantage: Deals 45,282 Nature damage. Weapons of Order: Deals 9,056 Nature damage and reduces the cooldown of Weapons of Order by 4 for each affected enemy, to a maximum of 20 sec.
clash = { 80629, 324312, 1 }, -- You and the target charge each other, meeting halfway then rooting all targets within 6 yards for 4 sec.
counterstrike = { 80631, 383785, 1 }, -- Each time you dodge or an enemy misses you, your next Tiger Palm or Spinning Crane Kick deals 100% increased damage.
dampen_harm = { 80704, 122278, 1 }, -- Reduces all damage you take by 20% to 50% for 10 sec, with larger attacks being reduced by more.
dance_of_the_wind = { 80704, 414132, 1 }, -- Your dodge chance is increased by 10%.
detox = { 81633, 218164, 1 }, -- Removes all Poison and Disease effects from the target.
dragonfire_brew = { 80651, 383994, 1 }, -- After using Breath of Fire, you breathe fire 2 additional times, each dealing 377 Fire damage. Breath of Fire damage increased by up to 100% based on your level of Stagger.
elusive_footwork = { 80602, 387046, 2 }, -- Blackout Kick deals an additional 5% damage. Blackout Kick critical hits grant an additional 1 stack of Elusive Brawler.
Expand Down
13 changes: 9 additions & 4 deletions Dragonflight/MonkMistweaver.lua
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ spec:RegisterTalents( {
chi_torpedo = { 80685, 115008, 1 }, -- Torpedoes you forward a long distance and increases your movement speed by $119085m1% for $119085d, stacking up to 2 times.
chi_wave = { 80709, 115098, 1 }, -- A wave of Chi energy flows through friends and foes, dealing $132467s1 Nature damage or $132463s1 healing. Bounces up to $s1 times to targets within $132466a2 yards.
close_to_heart = { 80707, 389574, 2 }, -- You and your allies within $m2 yards have $s1% increased healing taken from all sources.
dampen_harm = { 80704, 122278, 1 }, -- Reduces all damage you take by $m2% to $m3% for $d, with larger attacks being reduced by more.
dance_of_the_wind = { 80704, 414132, 1 }, -- Your dodge chance is increased by $s1%.
diffuse_magic = { 80697, 122783, 1 }, -- Reduces magic damage you take by $m1% for $d, and transfers all currently active harmful magical effects on you back to their original caster if possible.
disable = { 80679, 116095, 1 }, -- Reduces the target's movement speed by $s1% for $d, duration refreshed by your melee attacks.$?s343731[ Targets already snared will be rooted for $116706d instead.][]
elusive_mists = { 80603, 388681, 2 }, -- Reduces all damage taken while channelling Soothing Mists by $s1%.
Expand Down Expand Up @@ -75,13 +73,13 @@ spec:RegisterTalents( {
celestial_harmony = { 80582, 343655, 1 }, -- While active, Yu'lon and Chi'Ji heal up to $s3 nearby targets with Enveloping Breath when you cast Enveloping Mist, healing for ${$325209s1*$325209d/$325209t1} over $325209d, and increasing the healing they receive from you by $325209s3%.; When activated, Yu'lon and Chi'Ji apply Chi Cocoons to $406139s3 targets within $406139r yds, absorbing $<newshield> damage for $406139d.
chrysalis = { 80583, 202424, 1 }, -- Reduces the cooldown of Life Cocoon by ${$m1/-1000} sec.
clouded_focus = { 80598, 388047, 1 }, -- Healing with Enveloping Mists or Vivify while channeling Soothing Mists increases their healing done by $388048m1% and reduces their mana cost by $388048m2%. Stacks up to $388048u times.; When your Soothing Mists channel ends, this effect is cancelled.
dampen_harm = { 80704, 122278, 1 }, -- Reduces all damage you take by $m2% to $m3% for $d, with larger attacks being reduced by more.
dance_of_the_wind = { 80704, 414132, 1 }, -- Your dodge chance is increased by $s1%.
dancing_mists = { 80587, 388701, 2 }, -- Renewing Mist has a $s1% chance to immediately spread to an additional target when initially cast or when traveling to a new target.
echoing_reverberation = { 80564, 388604, 1 }, -- Zen Pulse triggers a second time at $s1% effectiveness if cast on targets with Enveloping Mist.
energizing_brew = { 80575, 422031, 1 }, -- Mana Tea now channels $s1% faster and generates $s2% more Mana.
enveloping_mist = { 80568, 124682, 1 }, -- Wraps the target in healing mists, healing for $o1 over $d, and increasing healing received from your other spells by $m2%. $?a388847[; Applies Renewing Mist for $388847s1 seconds to an ally within $388847r yds.][]
essence_font = { 80597, 191837, 1 }, -- Unleashes a rapid twirl of healing bolts at up to $s1 allies within $191840A1 yds, every ${6*$t1}.1 sec for $d. Each bolt heals a target for $191840s1, plus an additional $191840o2 over $191840d.; Gust of Mists will heal affected targets twice. Castable while moving.$?a337209[; Each bolt has a chance to reduce the cooldown of Thunder Focus Tea by $337209s1 sec.][]
faeline_stomp = { 80560, 388193, 1 }, -- Strike the ground fiercely to expose a faeline for $d, dealing $388207s1 Nature damage to up to 5 enemies, and restores $388207s2 health to up to 5 allies within $388207a1 yds caught in the faeline. $?a137024[Up to 5 allies]?a137025[Up to 5 enemies][Stagger is $s3% more effective for $347480d against enemies] caught in the faeline$?a137023[]?a137024[ are healed with an Essence Font bolt][ suffer an additional $388201s1 damage].; Your abilities have a $s2% chance of resetting the cooldown of Faeline Stomp while fighting on a faeline.
jadefire_stomp = { 80560, 388193, 1 }, -- Strike the ground fiercely to expose a faeline for $d, dealing $388207s1 Nature damage to up to 5 enemies, and restores $388207s2 health to up to 5 allies within $388207a1 yds caught in the faeline. $?a137024[Up to 5 allies]?a137025[Up to 5 enemies][Stagger is $s3% more effective for $347480d against enemies] caught in the faeline$?a137023[]?a137024[ are healed with an Essence Font bolt][ suffer an additional $388201s1 damage].; Your abilities have a $s2% chance of resetting the cooldown of Faeline Stomp while fighting on a faeline.
focused_thunder = { 80593, 197895, 1 }, -- Thunder Focus Tea now empowers your next ${$m1+1} spells.
font_of_life = { 80580, 337209, 1 }, -- Your Essence Font's initial heal is increased by $s2% and has a chance to reduce the cooldown of Thunder Focus Tea by $s1 sec.
gift_of_the_celestials = { 80576, 388212, 1 }, -- Reduces the cooldown of $?s325197[Invoke Chi-Ji, the Red Crane][Invoke Yul'on, the Jade Serpent] by 2 min, but decreases its duration to 12 sec.
Expand All @@ -94,6 +92,7 @@ spec:RegisterTalents( {
invoke_yulon_the_jade_serpent = { 80590, 322118, 1 }, -- Summons an effigy of Yu'lon, the Jade Serpent for $d. Yu'lon will heal injured allies with Soothing Breath, healing the target and up to $s2 allies for $343737o1 over $343737d. ; Enveloping Mist costs $s4% less mana while Yu'lon is active.
invokers_delight = { 80571, 388661, 1 }, -- You gain $388663m1% haste for $?a388212[${$s2-$s3} sec][$388663d] after summoning your Celestial.
jade_bond = { 80576, 388031, 1 }, -- Abilities that activate Gust of Mist reduce the cooldown on $?s325197[Invoke Chi-Ji, the Red Crane][Invoke Yul'on, the Jade Serpent] by ${$s2/-1000}.1 sec, and $?s325197[Chi-Ji's Gusts of Mists][Yu'lon's Soothing Breath] healing is increased by $s1%.
jadefire_stomp = { 80560, 388193, 1 }, -- Strike the ground fiercely to expose a path of jade for $d, dealing $388207s1 Nature damage to up to 5 enemies, and restores $388207s2 health to up to 5 allies within $388207a1 yds caught in the path. $?a137024[Up to 5 allies]?a137025[Up to 5 enemies][Stagger is $s3% more effective for $347480d against enemies] caught in the path$?a137023[]?a137024[ are healed with an Essence Font bolt][ suffer an additional $388201s1 damage].; Your abilities have a $s2% chance of resetting the cooldown of Jadefire Stomp while fighting within the path.
legacy_of_wisdom = { 92684, 404408, 1 }, -- Sheilun's Gift heals $s1 additional allies and its cast time is reduced by ${$s2/-1000}.1 sec.
life_cocoon = { 80584, 116849, 1 }, -- Encases the target in a cocoon of Chi energy for $d, absorbing $<newshield> damage and increasing all healing over time received by $m2%.$?a388548[; Applies Renewing Mist and Enveloping Mist to the target.][]
lifecycles = { 80575, 197915, 1 }, -- Vivify has a $s2% chance to cause your next Rising Sun Kick or Enveloping Mist to generate $s1 stack of Mana Tea.; Enveloping Mist and Rising Sun Kick have a $s3% chance to cause your next Vivify to generate $s1 stack of Mana Tea.
Expand Down Expand Up @@ -211,6 +210,12 @@ spec:RegisterAuras( {
duration = 10,
max_stack = 1
},
-- Your dodge chance is increased by $w1% until you dodge an attack.
dance_of_the_wind = {
id = 432180,
duration = 10.0,
max_stack = 1,
},
diffuse_magic = {
id = 122783,
duration = 6,
Expand Down
Loading

0 comments on commit 0d2ecb5

Please sign in to comment.