Merge pull request #3314 from Supernuss/cata_dk

Fix Potions; Fix Danceless-Arms; Blood-DK AoE-Fix; New Retri-APL

Cataclysm/APLs/DeathKnightBlood.simc

@@ -60,8 +60,8 @@ actions+=/run_action_list,name=aoe,if=active_enemies>1
 # Use Death Strike if Frost or Unholy runes are full, health is at or below 50%, or Blood Shield is not active
 actions+=/death_strike,if=frost_runes.current=2|unholy_runes.current=2|health.pct<=50|!buff.blood_shield.up
 
-# Use Rune Strike if runic power is at or above 120
-actions+=/rune_strike,if=runic_power.current>=120
+# Use Rune Strike if we are close to runic_power cap
+actions+=/rune_strike,if=runic_power.current>=runic_power.max-10
 
 # Use Blood Tap if a single Frost, Unholy, or Death rune is available and Death Strike is not ready
 actions+=/blood_tap,if=(frost_runes.current=1|unholy_runes.current=1|death_runes.current=1)&!action.death_strike.ready

Cataclysm/APLs/PaladinRetributionHimeaBeta.simc → Cataclysm/APLs/PaladinRetribution.simc

@@ -1,6 +1,6 @@
-# Paladin: Retribution
-# Himea's Beta APL - Discord: himea.saito
-# May 2024
+## Retribution Paladin
+# Based on WoWSims
+
 
 ## Precombat
 actions.precombat+=/retribution_aura,if=!buff.aura.up&settings.maintain_aura&assigned_aura.retribution_aura
@@ -11,21 +11,40 @@ actions.precombat+=/resistance_aura,if=!buff.aura.up&settings.maintain_aura&assi
 actions.precombat+=/blessing_of_kings,if=!buff.blessing.up&settings.maintain_blessing&assigned_blessing.blessing_of_kings
 actions.precombat+=/blessing_of_might,if=!buff.blessing.up&settings.maintain_blessing&assigned_blessing.blessing_of_might
 actions.precombat+=/seal_of_truth,if=buff.seal.remains<300
-actions.precombat+=/divine_plea,if=mana.percent<settings.divine_plea_threshold
+actions.precombat+=/divine_plea,if=mana.percent<90
+actions.precombat+=/guardian_of_ancient_kings,if=cooldown.zealotry.remains<=10|cooldown.zealotry.remains>=time_to_die
 actions.precombat+=/judgement
 
 ## Default
-actions+=/call_action_list,name=init
-actions+=/use_items
-actions+=/potion
-actions+=/hyperspeed_acceleration,use_off_gcd=1
 actions+=/run_action_list,name=cleave,if=active_enemies>1
 actions+=/run_action_list,name=single
 
-## Init Parameters
-actions.init+=/variable,name=time_to_die,value=(debuff.training_dummy.up&300)|target.time_to_die
+## Single
+actions.single+=/rebuke
+actions.single+=/seal_of_truth,if=buff.seal.down|(buff.seal_of_righteousness.up&active_enemies=1)
+actions.single+=/judgement,if=!buff.judgements_of_the_pure.up
+actions.single+=/guardian_of_ancient_kings,if=cooldown.zealotry.remains<=10|cooldown.zealotry.remains>=time_to_die
+# also activate all other cooldowns if buff.zealotry.up&buff.inquisition.up
+actions.single+=/use_items,if=buff.zealotry.up&buff.inquisition.up
+actions.single+=/potion,if=buff.zealotry.up&buff.inquisition.up
+actions.single+=/avenging_wrath,if=((buff.zealotry.up&!settings.zealotry_macro)|!talent.zealotry.enabled)&buff.inquisition.up
+actions.single+=/zealotry
+actions.single+=/inquisition,if=buff.inquisition.remains<=3.5&!action.zealotry.ready&cooldown.zealotry.remains&target.time_to_die>6
+actions.single+=/synapse_springs,if=cooldown.avenging_wrath.remains>=35
+actions.single+=/word_of_glory,if=buff.selfless.down&(holy_power=3|buff.divine_purpose.up)&settings.selfless_healer&(can_spend_holy_power|!settings.zealotry_save)
+actions.single+=/templars_verdict,if=holy_power>=3|buff.divine_purpose.up&cooldown.crusader_strike.remains
+actions.single+=/crusader_strike,if=holy_power<3
+actions.single+=/judgement,if=set_bonus.tier13_2pc_melee&!buff.zealotry.up&holy_power<3
+actions.single+=/exorcism,if=(cooldown.crusader_strike.remains>=1|!buff.bloodlust.up)&buff.the_art_of_war.up
+actions.single+=/hammer_of_wrath
+actions.single+=/judgement,if=cooldown.crusader_strike.remains>=1|!buff.bloodlust.up
+actions.single+=/holy_wrath,if=cooldown.crusader_strike.remains>=1|!buff.bloodlust.up
+actions.single+=/consecration,if=(settings.ignore_consecration_movement|!moving)&settings.single_target_consecration&(cooldown.crusader_strike.remains>=1|!buff.bloodlust.up)&mana.current>=16000
+actions.single+=/divine_plea,if=mana.percent<settings.divine_plea_threshold
+
 
 ## Cleave
+actions.cleave+=/rebuke
 actions.cleave+=/seal_of_righteousness,if=buff.seal_of_righteousness.down&active_enemies>=settings.seal_of_righteousness
 actions.cleave+=/judgement,if=(mana.percent<settings.mana_judgement_threshold)&buff.judgements_of_the_bold.down
 actions.cleave+=/guardian_of_ancient_kings,if=cooldown.zealotry.remains<10
@@ -43,28 +62,9 @@ actions.cleave+=/templars_verdict,if=(buff.divine_purpose.up|holy_power=3)&(can_
 actions.cleave+=/consecration,if=(settings.ignore_consecration_movement|!moving)&!buff.active_consecration.up&active_enemies>2
 actions.cleave+=/judgement,if=buff.zealotry.down&holy_power<3
 actions.cleave+=/exorcism,if=buff.the_art_of_war.up
-actions.cleave+=/hammer_of_wrath,if=buff.avenging_wrath.up|target.health.pct<2
+actions.cleave+=/hammer_of_wrath
 actions.cleave+=/judgement,if=set_bonus.tier13_2pc_melee&buff.zealotry.up&holy_power<3
 actions.cleave+=/crusader_strike
 actions.cleave+=/holy_wrath
 actions.cleave+=/divine_plea,if=mana.percent<settings.divine_plea_threshold
 
-## Single
-actions.single+=/seal_of_truth,if=buff.seal.down|(buff.seal_of_righteousness.up&active_enemies=1)
-actions.single+=/judgement,if=(mana.percent<settings.mana_judgement_threshold)&buff.judgements_of_the_bold.down
-actions.single+=/guardian_of_ancient_kings,if=cooldown.zealotry.remains<10
-actions.single+=/zealotry,use_off_gcd=1,if=buff.guardian_of_ancient_kings.remains<21&(holy_power=3|buff.divine_purpose.up)&level=85
-actions.single+=/zealotry,use_off_gcd=1,if=(holy_power=3|buff.divine_purpose.up)&level<85
-actions.single+=/avenging_wrath,use_off_gcd=1,if=(buff.zealotry.up&!settings.zealotry_macro)|!talent.zealotry.enabled
-actions.single+=/crusader_strike,if=holy_power<3
-actions.single+=/judgement,if=buff.zealotry.down&holy_power<3
-actions.single+=/inquisition,if=(buff.inquisition.down|(time_to_three_holy_power*0.66)>buff.inquisition.remains)&(holy_power=3|buff.divine_purpose.up)&(can_spend_holy_power|!settings.zealotry_save)
-actions.single+=/word_of_glory,if=buff.selfless.down&(holy_power=3|buff.divine_purpose.up)&settings.selfless_healer&(can_spend_holy_power|!settings.zealotry_save)
-actions.single+=/templars_verdict,if=(buff.divine_purpose.up|holy_power=3)&(can_spend_holy_power|!settings.zealotry_save)
-actions.single+=/exorcism,if=buff.the_art_of_war.up
-actions.single+=/hammer_of_wrath,if=buff.avenging_wrath.up|target.health.pct<20
-actions.single+=/judgement,if=set_bonus.tier13_2pc_melee&buff.zealotry.up&holy_power<3
-actions.single+=/crusader_strike
-actions.single+=/holy_wrath
-actions.single+=/divine_plea,if=mana.percent<settings.divine_plea_threshold
-actions.single+=/consecration,if=(settings.ignore_consecration_movement|!moving)&!buff.active_consecration.up&mana.percent>70&settings.single_target_consecration

Cataclysm/APLs/ShamanElemental.simc

@@ -0,0 +1,37 @@
+## Elemental Shaman
+# Based on WoWSims/Shaman Discord
+
+
+actions.precombat+=/flametongue_weapon,if=!mainhand_imbued
+actions.precombat+=/flametongue_weapon,if=!offhand_imbued
+actions.precombat+=/lightning_shield,if=buff.shield.down
+actions.precombat+=/call_of_the_elements,if=buff.earth_totem.down&buff.fire_totem.down&buff.water_totem.down&buff.air_totem.down
+actions.precombat+=/potion
+
+actions+=/call_action_list,name=aoe,if=active_enemies>2
+actions+=/call_action_list,name=single
+
+# Single-target rotation
+actions.single+=/fire_elemental_totem,if=buff.potion.up|target.time_to_die<=120
+actions.single+=/call_of_the_elements,if=buff.earth_totem.down&buff.fire_totem.down&buff.water_totem.down&buff.air_totem.down
+actions.single+=/searing_totem,if=buff.fire_totem.down
+actions.single+=/elemental_mastery
+actions.single+=/flame_shock,if=debuff.flame_shock.remains<=2
+actions.single+=/lava_burst,if=debuff.flame_shock.remains>2
+actions.single+=/earth_shock,if=buff.lightning_shield.stack>=7
+actions.single+=/thunderstorm,if=mana.pct<60
+actions.single+=/lightning_shield,if=buff.shield.down
+actions.single+=/chain_lightning,if=active_enemies>1&!moving
+actions.single+=/unleash_elements,if=moving&!glyph.unleashed_lightning.enabled
+actions.single+=/lightning_bolt
+
+# AoE rotation
+actions.aoe+=/call_of_the_ancestors,if=buff.earth_totem.down&buff.fire_totem.down&buff.water_totem.down&buff.air_totem.down
+actions.aoe+=/fire_elemental_totem
+actions.aoe+=/elemental_mastery
+actions.aoe+=/earth_shock,if=buff.lightning_shield.stack>=9&active_enemies<=4
+actions.aoe+=/magma_totem,if=buff.fire_totem.down&target.within6
+actions.aoe+=/thunderstorm,if=mana.pct<60
+actions.aoe+=/lightning_shield,if=buff.shield.down
+actions.aoe+=/lightning_bolt,if=moving&glyph.unleashed_lightning.enabled
+actions.aoe+=/chain_lightning

Cataclysm/APLs/WarriorArms.simc

@@ -23,21 +23,22 @@ actions+=/cleave,if=active_enemies>1&!buff.sweeping_strikes.up&(rage.current>=se
 #maybe implement heroic_leap here?
 actions+=/call_action_list,name=battle_stance,if=(buff.battle_stance.up|settings.macro_stance_dance)&(!dot.rend.ticking|overpower_now)
 actions+=/call_action_list,name=berserker_stance,if=(settings.macro_stance_dance|buff.berserker_stance.up)
+actions+=/berserker_stance,use_off_gcd=1,if=!settings.macro_stance_dance&!buff.berserker_stance.up&buff.taste_for_blood_prediction.remains>1
 
 ## Spread Rend in AoE
-actions.spread_rend+=/battle_stance,if=!settings.macro_stance_dance&!up&!dot.rend.ticking
+actions.spread_rend+=/battle_stance,use_off_gcd=1,if=!settings.macro_stance_dance&!up&!dot.rend.ticking
 actions.spread_rend+=/rend,if=!up
 actions.spread_rend+=/thunder_clap,if=dot.rend.ticking
 
 ## Battle_Stance
-actions.battle_stance+=/battle_stance,if=!settings.macro_stance_dance&!buff.battle_stance.up
+actions.battle_stance+=/battle_stance,use_off_gcd=1,if=!settings.macro_stance_dance&!buff.battle_stance.up
 actions.battle_stance+=/shattering_throw,if=settings.debuff_shattering_throw
 actions.battle_stance+=/rend,if=!up
 actions.battle_stance+=/overpower,if=overpower_now|overpower_filler
-actions.battle_stance+=/berserker_stance,if=!settings.macro_stance_dance&!buff.berserker_stance.up
+actions.battle_stance+=/berserker_stance,use_off_gcd=1,if=!settings.macro_stance_dance&!buff.berserker_stance.up
 
 ## Berserker_stance
-actions.berserker_stance+=/run_action_list,name=battle_stance,if=!dot.rend.ticking|overpower_now
+actions.berserker_stance+=/run_action_list,name=battle_stance,use_off_gcd=1,if=!dot.rend.ticking|overpower_now
 actions.berserker_stance+=/mortal_strike,if=(target.health.pct>20|buff.slaughter.remains<=1.5|talent.lambs_to_the_slaughter&dot.rend.ticking&dot.rend.remains<3|talent.wrecking_crew.enabled&!buff.enrage.up)
 actions.berserker_stance+=/whirlwind,if=active_enemies>=4
 actions.berserker_stance+=/colossus_smash,if=!debuff.colossus_smash.up