diff --git a/defaut/Chaman.lua b/defaut/Chaman.lua index 63002cc..397b396 100644 --- a/defaut/Chaman.lua +++ b/defaut/Chaman.lua @@ -25,7 +25,7 @@ Define(earthquake 61882) Define(elemental_blast 117014) SpellInfo(elemental_blast cd=12 ) Define(elemental_mastery 16166) - SpellInfo(elemental_mastery duration=20 cd=120 ) + SpellInfo(elemental_mastery duration=20 cd=90 ) SpellAddBuff(elemental_mastery elemental_mastery=1) Define(feral_spirit 51533) SpellInfo(feral_spirit duration=30 cd=120 ) @@ -34,7 +34,7 @@ Define(fire_elemental_totem 2894) Define(fire_nova 1535) SpellInfo(fire_nova cd=4 ) Define(flame_shock 8050) - SpellInfo(flame_shock duration=24 tick=3 sharedcd=shock cd=6 ) + SpellInfo(flame_shock duration=30 tick=3 sharedcd=shock cd=6 ) SpellAddTargetDebuff(flame_shock flame_shock=1) Define(flametongue_weapon 8024) Define(heroism 32182) @@ -46,8 +46,8 @@ Define(lava_burst 51505) Define(lava_lash 60103) SpellInfo(lava_lash cd=10 ) Define(lava_surge 77756) -Define(lifeblood 55503) - SpellInfo(lifeblood cd=120 ) +Define(lifeblood 138724) + SpellInfo(lifeblood mana=-9935 ) SpellAddBuff(lifeblood lifeblood=1) Define(lightning_bolt 403) Define(lightning_shield 324) @@ -71,6 +71,8 @@ Define(stormlash_totem 120668) Define(stormstrike 17364) SpellInfo(stormstrike duration=15 sharedcd=strike cd=8 ) SpellAddBuff(stormstrike stormstrike=1) +Define(strike 138537) + SpellInfo(strike energy=40 ) Define(thunderstorm 51490) SpellInfo(thunderstorm duration=5 cd=45 ) SpellAddBuff(thunderstorm thunderstorm=1) @@ -101,7 +103,7 @@ AddIcon mastery=1 help=main if BuffStacks(lightning_shield) ==7 Spell(earth_shock) if BuffStacks(lightning_shield) >3 and target.DebuffRemains(flame_shock) >SpellCooldown(earth_shock) and target.DebuffRemains(flame_shock) <SpellCooldown(earth_shock) +TickTime(flame_shock) Spell(earth_shock) if TimeInCombat() >60 and target.DebuffRemains(flame_shock) <=BuffDuration(ascendance) and SpellCooldown(ascendance) +BuffDuration(ascendance) <BuffDuration(flame_shock) Spell(flame_shock) - if SpellCooldown(fire_elemental_totem) >15 and not TotemPresent(fire) Spell(searing_totem) + if SpellCooldown(fire_elemental_totem) >20 and not TotemPresent(fire) Spell(searing_totem) Spell(lightning_bolt) } @@ -113,6 +115,7 @@ AddIcon mastery=1 help=moving { if not Glyph(101052) Spell(unleash_elements) + if not Glyph(101052) and target.DebuffRemains(flame_shock) >SpellCooldown(earth_shock) Spell(earth_shock) } AddIcon mastery=1 help=aoe @@ -140,8 +143,8 @@ AddIcon mastery=1 help=cd if {{SpellCooldown(ascendance) >10 or Level() <87 } and SpellCooldown(fire_elemental_totem) >10 } or BuffPresent(ascendance) or BuffPresent(bloodlust any=1) or TotemPresent(fire) { Item(Trinket0Slot usable=1) Item(Trinket1Slot usable=1) } if TalentPoints(ancestral_swiftness_talent) and not BuffPresent(ascendance) Spell(ancestral_swiftness) - if ArmorSetParts(T14 more 4) and {not BuffPresent(bloodlust any=1) or target.DeadIn() <25 } Spell(spiritwalkers_grace) - if not TotemPresent(earth) and SpellCooldown(fire_elemental_totem) >=50 Spell(earth_elemental_totem) + if BuffPresent(ascendance) Spell(spiritwalkers_grace) + if not TotemPresent(earth) and SpellCooldown(fire_elemental_totem) >=60 Spell(earth_elemental_totem) if Glyph(101052) and {{TalentPoints(elemental_blast_talent) and SpellCooldown(elemental_blast) ==0 } or {SpellCooldown(lava_burst) ==0 and not BuffStacks(lava_surge) } } or {BuffDuration(raid_movement) >=SpellCooldown(unleash_elements) +SpellCooldown(earth_shock) } Spell(spiritwalkers_grace) } @@ -163,11 +166,11 @@ AddIcon mastery=2 help=main if BuffPresent(unleash_flame) and not target.DebuffPresent(flame_shock) Spell(flame_shock) Spell(lava_lash) if ArmorSetParts(T15 more 2) ==1 and BuffStacks(maelstrom_weapon) >=4 and not BuffPresent(ascendance) Spell(lightning_bolt) - if not Glyph(55447) and {BuffPresent(unleash_flame) or {not BuffPresent(unleash_flame) and not target.DebuffPresent(flame_shock) and SpellCooldown(unleash_elements) >5 } } Spell(flame_shock) + if BuffPresent(unleash_flame) or {not BuffPresent(unleash_flame) and not target.DebuffPresent(flame_shock) and SpellCooldown(unleash_elements) >5 } Spell(flame_shock) Spell(unleash_elements) if BuffStacks(maelstrom_weapon) >=3 and not BuffPresent(ascendance) Spell(lightning_bolt) if BuffPresent(ancestral_swiftness) Spell(lightning_bolt) - if Glyph(55447) and BuffPresent(unleash_flame) and target.DebuffRemains(flame_shock) <=3 Spell(flame_shock) + if BuffPresent(unleash_flame) and target.DebuffRemains(flame_shock) <=3 Spell(flame_shock) Spell(earth_shock) if BuffStacks(maelstrom_weapon) >1 and not BuffPresent(ascendance) Spell(lightning_bolt) diff --git a/defaut/Chasseur.lua b/defaut/Chasseur.lua index 5b63d68..50e8a23 100644 --- a/defaut/Chasseur.lua +++ b/defaut/Chasseur.lua @@ -94,7 +94,6 @@ AddIcon mastery=1 help=main } if BuffStacks(pet_frenzy any=1)>4 Spell(focus_fire) if not target.DebuffPresent(serpent_sting_aura) Spell(serpent_sting) - if SpellUsable(fervor) and not target.DebuffPresent(fervor) and Focus() <=65 Spell(fervor) if target.HealthPercent(less 20) Spell(kill_shot) Spell(kill_command) if SpellUsable(dire_beast) and Focus() <=90 Spell(dire_beast) @@ -114,6 +113,7 @@ AddIcon mastery=1 help=offgcd unless Stance(1) Spell(aspect_of_the_hawk) } unless Stance(1) Spell(aspect_of_the_hawk) + if SpellUsable(fervor) and not target.DebuffPresent(fervor) and Focus() <=65 Spell(fervor) if Focus() >60 and not BuffPresent(beast_within) Spell(bestial_wrath) if BuffPresent(rapid_fire) or BuffStacks(bloodlust any=1) or target.DeadIn() <=25 Spell(stampede) if SpellUsable(a_murder_of_crows) and not target.DebuffPresent(a_murder_of_crows) Spell(a_murder_of_crows) @@ -141,7 +141,6 @@ AddIcon mastery=2 help=main } if SpellUsable(powershot) Spell(powershot) if SpellUsable(blink_strike) Spell(blink_strike) - if SpellUsable(fervor) and Focus() <=50 Spell(fervor) if SpellUsable(dire_beast) Spell(dire_beast) if target.HealthPercent() >80 { @@ -171,6 +170,7 @@ AddIcon mastery=2 help=offgcd } unless Stance(1) Spell(aspect_of_the_hawk) if SpellUsable(lynx_rush) and not target.DebuffPresent(lynx_rush) Spell(lynx_rush) + if SpellUsable(fervor) and Focus() <=50 Spell(fervor) if BuffPresent(rapid_fire) or BuffStacks(bloodlust any=1) or target.DeadIn() <=25 Spell(stampede) if SpellUsable(a_murder_of_crows) and not target.DebuffPresent(a_murder_of_crows) Spell(a_murder_of_crows) if SpellUsable(glaive_toss) Spell(glaive_toss) @@ -209,7 +209,6 @@ AddIcon mastery=3 help=main if BuffStacks(thrill_of_the_hunt) and target.DebuffRemains(serpent_sting_aura) <2 Spell(multi_shot) if BuffStacks(thrill_of_the_hunt) Spell(arcane_shot) if SpellUsable(dire_beast) Spell(dire_beast) - if SpellUsable(fervor) and Focus() <=50 Spell(fervor) if target.DebuffRemains(serpent_sting_aura) <6 Spell(cobra_shot) if Focus() >=67 Spell(arcane_shot) Spell(cobra_shot) @@ -225,6 +224,7 @@ AddIcon mastery=3 help=offgcd if SpellUsable(lynx_rush) and not target.DebuffPresent(lynx_rush) Spell(lynx_rush) if SpellUsable(glaive_toss) Spell(glaive_toss) if BuffPresent(rapid_fire) or BuffStacks(bloodlust any=1) or target.DeadIn() <=25 Spell(stampede) + if SpellUsable(fervor) and Focus() <=50 Spell(fervor) } AddIcon mastery=3 help=aoe { diff --git a/defaut/Chevalier.lua b/defaut/Chevalier.lua index 3998dd9..ce6ac36 100644 --- a/defaut/Chevalier.lua +++ b/defaut/Chevalier.lua @@ -39,8 +39,6 @@ Define(horn_of_winter 57330) SpellAddBuff(horn_of_winter horn_of_winter=1) Define(howling_blast 49184) SpellInfo(howling_blast frost=1 runicpower=-100 ) -Define(icy_touch 45477) - SpellInfo(icy_touch frost=1 runicpower=-100 ) Define(killing_machine 51128) Define(mogu_power_potion_aura 105706) SpellInfo(mogu_power_potion_aura duration=25 cd=1 ) @@ -71,7 +69,7 @@ Define(soul_reaper 114866) SpellAddBuff(soul_reaper soul_reaper=1) Define(sudden_doom 49530) Define(summon_gargoyle 49206) - SpellInfo(summon_gargoyle duration=40 runicpower=600 cd=180 ) + SpellInfo(summon_gargoyle duration=40 cd=180 ) SpellAddBuff(summon_gargoyle summon_gargoyle=1) Define(unholy_blight 115989) SpellInfo(unholy_blight duration=10 cd=90 ) @@ -144,10 +142,11 @@ AddIcon mastery=3 help=main unless Stance(3) Spell(unholy_presence) Spell(horn_of_winter) } + if AttackPower() >{LastSpellAttackPower(blood_plague) +5000 } and TimeInCombat() >15 and not {SpellCooldown(unholy_blight) >49 } Spell(outbreak) + if AttackPower() >{LastSpellAttackPower(blood_plague) +5000 } and TimeInCombat() >15 and not {SpellCooldown(unholy_blight) >49 } Spell(plague_strike) if target.DebuffRemains(frost_fever) <3 or target.DebuffRemains(blood_plague) <3 Spell(outbreak) if target.HealthPercent() -3 *{target.HealthPercent() /target.DeadIn() } <=35 Spell(soul_reaper) - if not target.DebuffPresent(frost_fever) Spell(icy_touch) - if not target.DebuffPresent(blood_plague) Spell(plague_strike) + if not target.DebuffPresent(blood_plague) or not target.DebuffPresent(frost_fever) Spell(plague_strike) Spell(dark_transformation) if RunicPower() >90 Spell(death_coil) if RuneCount(unholy) ==2 Spell(death_and_decay) diff --git a/defaut/Demoniste.lua b/defaut/Demoniste.lua index ebeda96..147d611 100644 --- a/defaut/Demoniste.lua +++ b/defaut/Demoniste.lua @@ -254,7 +254,7 @@ AddIcon mastery=3 help=main if {target.TicksRemain(immolate) <Ticks(immolate) /2 or target.DebuffExpires(immolate) } and target.DeadIn() >=5 Spell(immolate) if Charges(conflagrate) ==2 Spell(conflagrate) if not target.DebuffPresent(rain_of_fire) and not InFlightToTarget(rain_of_fire) Spell(rain_of_fire) - if BurningEmbers() and {BuffStacks(backdraft) <3 or Level() <86 } and {BurningEmbers() >35 or BuffRemains(dark_soul) >CastTime(chaos_bolt) or BuffRemains(skull_banner) >CastTime(chaos_bolt) } Spell(chaos_bolt) + if BurningEmbers() and {BuffStacks(backdraft) <3 or Level() <86 } and {{BurningEmbers() / 10} >3.5 or BuffRemains(dark_soul) >CastTime(chaos_bolt) or BuffRemains(skull_banner) >CastTime(chaos_bolt) } Spell(chaos_bolt) Spell(conflagrate) Spell(incinerate) } @@ -269,8 +269,8 @@ AddIcon mastery=3 help=aoe { if not target.DebuffPresent(rain_of_fire) and not InFlightToTarget(rain_of_fire) Spell(rain_of_fire) - if BurningEmbers() >=35 and BurningEmbers() and target.HealthPercent() <=20 focus.Spell(havoc) - if BurningEmbers() >=35 and BurningEmbers() and BuffStacks(havoc) >=1 if target.HealthPercent(less 20) Spell(shadowburn) + if {BurningEmbers() / 10} >=3.5 and BurningEmbers() and target.HealthPercent() <=20 focus.Spell(havoc) + if {BurningEmbers() / 10} >=3.5 and BurningEmbers() and BuffStacks(havoc) >=1 if target.HealthPercent(less 20) Spell(shadowburn) if BurningEmbers() and BuffExpires(fire_and_brimstone) Spell(fire_and_brimstone) if BuffPresent(fire_and_brimstone) and not target.DebuffPresent(immolate) Spell(immolate) if BuffPresent(fire_and_brimstone) Spell(conflagrate) diff --git a/defaut/Druide.lua b/defaut/Druide.lua index ef3823e..b565849 100644 --- a/defaut/Druide.lua +++ b/defaut/Druide.lua @@ -45,7 +45,7 @@ Define(natures_swiftness 132158) SpellInfo(natures_swiftness cd=60 ) SpellAddBuff(natures_swiftness natures_swiftness=1) Define(natures_vigil 124974) - SpellInfo(natures_vigil duration=30 cd=180 ) + SpellInfo(natures_vigil duration=30 cd=90 ) SpellAddBuff(natures_vigil natures_vigil=1) Define(omen_of_clarity 16864) SpellAddBuff(omen_of_clarity omen_of_clarity=1) @@ -149,8 +149,7 @@ AddIcon mastery=1 help=cd if BuffPresent(celestial_alignment) or SpellCooldown(celestial_alignment) >30 { Item(Trinket0Slot usable=1) Item(Trinket1Slot usable=1) } if TalentPoints(incarnation_talent) and {BuffPresent(lunar_eclipse) or BuffPresent(solar_eclipse) } Spell(incarnation) if {not BuffPresent(lunar_eclipse) and not BuffPresent(solar_eclipse) } and {BuffPresent(chosen_of_elune) or not TalentPoints(incarnation_talent) or SpellCooldown(incarnation) >10 } Spell(celestial_alignment) - if PTR() ==1 and TalentPoints(natures_vigil_talent) Spell(natures_vigil) - if not PTR() ==1 and TalentPoints(natures_vigil_talent) and {{TalentPoints(incarnation_talent) and BuffPresent(chosen_of_elune) } or {not TalentPoints(incarnation_talent) and BuffPresent(celestial_alignment) } } Spell(natures_vigil) + if TalentPoints(natures_vigil_talent) Spell(natures_vigil) } AddIcon mastery=2 help=main { @@ -273,4 +272,4 @@ AddIcon mastery=2 help=cd } ]] -OvaleScripts:RegisterScript("DRUID", "Ovale", "[5.1] Ovale: Balance, Feral", code) +OvaleScripts:RegisterScript("DRUID", "Ovale", "[5.2] Ovale: Balance, Feral", code) diff --git a/defaut/Guerrier.lua b/defaut/Guerrier.lua index 9115515..b0a3c5d 100644 --- a/defaut/Guerrier.lua +++ b/defaut/Guerrier.lua @@ -16,8 +16,7 @@ Define(bladestorm 46924) Define(bloodbath 113344) SpellInfo(bloodbath duration=6 tick=1 ) SpellAddTargetDebuff(bloodbath bloodbath=1) -Define(bloodsurge 46916) - SpellInfo(bloodsurge duration=10) +Define(bloodsurge 46915) Define(bloodthirst 23881) SpellInfo(bloodthirst rage=-10 cd=4.5 ) Define(cleave 845) @@ -25,9 +24,6 @@ Define(cleave 845) Define(colossus_smash 86346) SpellInfo(colossus_smash duration=6.5 cd=20 ) SpellAddTargetDebuff(colossus_smash colossus_smash=1) -Define(deadly_calm 85730) - SpellInfo(deadly_calm duration=9 cd=60 ) - SpellAddBuff(deadly_calm deadly_calm=1) Define(defensive_stance 71) SpellInfo(defensive_stance cd=3 ) Define(demoralizing_shout 1160) @@ -60,6 +56,7 @@ Define(mortal_strike 12294) SpellInfo(mortal_strike duration=10 rage=-10 cd=6 ) SpellAddTargetDebuff(mortal_strike mortal_wounds=1) Define(overpower 7384) + SpellInfo(overpower rage=10 ) SpellAddBuff(overpower taste_for_blood=-1) Define(pummel 6552) SpellInfo(pummel duration=4 cd=15 ) @@ -70,7 +67,7 @@ Define(raging_blow_aura 131116) SpellInfo(raging_blow_aura duration=12 ) SpellAddBuff(raging_blow_aura raging_blow_aura=1) Define(recklessness 1719) - SpellInfo(recklessness duration=12 cd=300 ) + SpellInfo(recklessness duration=12 cd=180 ) SpellAddBuff(recklessness recklessness=1) Define(revenge 6572) SpellInfo(revenge rage=-15 cd=9 ) @@ -89,15 +86,18 @@ Define(shield_wall 871) SpellInfo(shield_wall duration=12 cd=300 ) SpellAddBuff(shield_wall shield_wall=1) Define(shockwave 46968) - SpellInfo(shockwave cd=20 ) + SpellInfo(shockwave cd=40 ) SpellAddBuff(shockwave shockwave=1) Define(skull_banner 114207) SpellInfo(skull_banner duration=10 cd=180 ) Define(slam 1464) - SpellInfo(slam rage=30 ) + SpellInfo(slam rage=20 ) Define(storm_bolt 107570) SpellInfo(storm_bolt cd=30 ) SpellAddBuff(storm_bolt storm_bolt=1) +Define(sudden_execute 139958) + SpellInfo(sudden_execute duration=10 ) + SpellAddBuff(sudden_execute sudden_execute=1) Define(sunder_armor 7386) SpellInfo(sunder_armor rage=15 ) SpellAddTargetDebuff(sunder_armor weakened_armor=1) @@ -105,7 +105,7 @@ Define(sunder_armor 7386) Define(sweeping_strikes 12328) SpellInfo(sweeping_strikes duration=10 rage=30 cd=10 ) SpellAddBuff(sweeping_strikes sweeping_strikes=1) -Define(taste_for_blood 56638) +Define(taste_for_blood 56636) Define(thunder_clap 6343) SpellInfo(thunder_clap rage=20 cd=6 ) SpellAddTargetDebuff(thunder_clap weakened_blows=1) @@ -125,7 +125,6 @@ Define(wild_strike 100130) SpellAddBuff(wild_strike bloodsurge=-1) SpellAddTargetDebuff(wild_strike wild_strike=1) Define(avatar_talent 16) -Define(bladestorm_talent 10) Define(bloodbath_talent 17) Define(dragon_roar_talent 12) Define(impending_victory_talent 6) @@ -140,25 +139,27 @@ AddIcon mastery=1 help=main } if target.DebuffStacks(weakened_armor any=1) <3 or target.DebuffRemains(weakened_armor any=1) <3 if CheckBoxOn(sunder_armor_check) Spell(sunder_armor) Spell(mortal_strike) - if target.DebuffRemains(colossus_smash) <=1.5 Spell(colossus_smash) - if target.HealthPercent(less 20) Spell(execute) - Spell(overpower usable=1) - if TalentPoints(storm_bolt_talent) Spell(storm_bolt) - if TalentPoints(shockwave_talent) Spell(shockwave) - if TalentPoints(dragon_roar_talent) Spell(dragon_roar) - if TalentPoints(impending_victory_talent) and target.HealthPercent() >=20 Spell(impending_victory) + if TalentPoints(dragon_roar_talent) and TalentPoints(bloodbath_talent) and BuffPresent(bloodbath) and target.DebuffExpires(colossus_smash) and target.HealthPercent() >=20 Spell(dragon_roar) + if TalentPoints(storm_bolt_talent) and target.DebuffPresent(colossus_smash) Spell(storm_bolt) + if target.DebuffRemains(colossus_smash) <1 Spell(colossus_smash) + if target.DebuffPresent(colossus_smash) or BuffPresent(recklessness) or Rage() >=Rage() -25 if target.HealthPercent(less 20) Spell(execute) + if TalentPoints(dragon_roar_talent) and {TalentPoints(bloodbath_talent) and BuffPresent(bloodbath) and target.HealthPercent() >=20 } or {target.DebuffExpires(colossus_smash) and target.HealthPercent() <20 } Spell(dragon_roar) + if target.DebuffPresent(colossus_smash) and {target.DebuffRemains(colossus_smash) <1 or BuffPresent(recklessness) } and target.HealthPercent() >=20 Spell(slam) + if BuffStacks(taste_for_blood) >=3 and target.HealthPercent() >=20 Spell(overpower usable=1) + if target.DebuffPresent(colossus_smash) and target.DebuffRemains(colossus_smash) <2.5 and target.HealthPercent() >=20 Spell(slam) + if BuffExpires(sudden_execute) if target.HealthPercent(less 20) Spell(execute) + if target.HealthPercent() >=20 or BuffPresent(sudden_execute) Spell(overpower usable=1) if Rage() >=40 and target.HealthPercent() >=20 Spell(slam) - if Rage() <90 Spell(battle_shout) + Spell(battle_shout) + Spell(heroic_throw) } AddIcon mastery=1 help=offgcd { if target.IsInterruptible() Spell(pummel) - if TalentPoints(bloodbath_talent) and {{{SpellCooldown(recklessness) >=10 or BuffPresent(recklessness) } or {target.HealthPercent() >=20 and {target.DeadIn() <=165 or {target.DeadIn() <=315 and not ArmorSetParts(T14 more 4) } } and target.DeadIn() >75 } } or target.DeadIn() <=19 } Spell(bloodbath) - if not BuffPresent(enrage) Spell(berserker_rage) + if TalentPoints(bloodbath_talent) and {target.DeadIn() <=18 or BuffPresent(recklessness) or target.DeadIn() >=75 } Spell(bloodbath) + if BuffExpires(enrage) and Rage() <=Rage() -10 Spell(berserker_rage) if target.DebuffPresent(colossus_smash) if CheckBoxOn(heroic_leap_check) Spell(heroic_leap) - if Rage() >=40 Spell(deadly_calm) - if not PTR() and {{BuffPresent(taste_for_blood) and BuffRemains(taste_for_blood) <=2 } or {BuffStacks(taste_for_blood) ==5 and SpellUsable(overpower) } or {BuffPresent(taste_for_blood) and target.DebuffRemains(colossus_smash) <=2 and not SpellCooldown(colossus_smash) ==0 } or BuffPresent(deadly_calm) or Rage() >110 } and target.HealthPercent() >=20 and target.DebuffPresent(colossus_smash) Spell(heroic_strike) - if PTR() and {{{target.DebuffPresent(colossus_smash) and Rage() >=70 } } and target.HealthPercent() >=20 } or Rage() >=110 Spell(heroic_strike) + if {target.DebuffPresent(colossus_smash) and Rage() >=Rage() -40 and target.HealthPercent() >=20 } or Rage() >=Rage() -15 Spell(heroic_strike) } AddIcon mastery=1 help=aoe { @@ -173,10 +174,10 @@ AddIcon mastery=1 help=aoe } AddIcon mastery=1 help=cd { - if {{target.DebuffRemains(colossus_smash) >=5 or SpellCooldown(colossus_smash) <=4 } and {{not TalentPoints(avatar_talent) or not ArmorSetParts(T14 more 4) } and {{target.HealthPercent() <20 or target.DeadIn() >315 or {target.DeadIn() >165 and ArmorSetParts(T14 more 4) } } } or {TalentPoints(avatar_talent) and ArmorSetParts(T14 more 4) and BuffPresent(avatar) } } } or target.DeadIn() <=18 Spell(recklessness) - if TalentPoints(avatar_talent) and {{{SpellCooldown(recklessness) >=180 or BuffPresent(recklessness) } or {target.HealthPercent() >=20 and target.DeadIn() >195 } or {target.HealthPercent() <20 and ArmorSetParts(T14 more 4) } } or target.DeadIn() <=20 } Spell(avatar) - if {BuffPresent(recklessness) and not ArmorSetParts(T15 more 4) } or {not BuffPresent(recklessness) and ArmorSetParts(T15 more 4) } Spell(skull_banner) - if not TalentPoints(bloodbath_talent) or {TalentPoints(bloodbath_talent) and BuffPresent(bloodbath) } { Item(Trinket0Slot usable=1) Item(Trinket1Slot usable=1) } + if target.DeadIn() <=18 or {{target.DeadIn() >=186 or {target.HealthPercent() <20 and {target.DebuffRemains(colossus_smash) >=5 or SpellCooldown(colossus_smash) <=1.5 } } } and {not TalentPoints(bloodbath_talent) or not SpellCooldown(bloodbath) } } Spell(recklessness) + if TalentPoints(avatar_talent) and {BuffPresent(recklessness) or target.DeadIn() <=25 } Spell(avatar) + if BuffPresent(recklessness) Spell(skull_banner) + if TalentPoints(bloodbath_talent) and BuffPresent(bloodbath) { Item(Trinket0Slot usable=1) Item(Trinket1Slot usable=1) } } AddIcon mastery=2 help=main { @@ -185,31 +186,30 @@ AddIcon mastery=2 help=main unless Stance(1) Spell(battle_stance) } if target.DebuffStacks(weakened_armor any=1) <3 or target.DebuffRemains(weakened_armor any=1) <3 if CheckBoxOn(sunder_armor_check) Spell(sunder_armor) + if BuffStacks(raging_blow_aura) ==2 and target.DebuffPresent(colossus_smash) and target.HealthPercent() >=20 Spell(raging_blow) if not {target.HealthPercent() <20 and target.DebuffPresent(colossus_smash) and Rage() >=30 } Spell(bloodthirst) if BuffStacks(bloodsurge) and target.HealthPercent() >=20 and SpellCooldown(bloodthirst) <=1 Spell(wild_strike) if not {target.HealthPercent() <20 and target.DebuffPresent(colossus_smash) and Rage() >=30 } and SpellCooldown(bloodthirst) <=1 and SpellCooldown(bloodthirst) if CheckBoxOn(showwait) Texture(Spell_nature_timestop) if TalentPoints(dragon_roar_talent) and {not target.DebuffPresent(colossus_smash) and {BuffPresent(bloodbath) or not TalentPoints(bloodbath_talent) } } Spell(dragon_roar) Spell(colossus_smash) - if target.HealthPercent(less 20) Spell(execute) + if BuffPresent(enrage) or target.DebuffPresent(colossus_smash) or Rage() >90 or target.DeadIn() <12 or BuffPresent(recklessness) if target.HealthPercent(less 20) Spell(execute) if TalentPoints(storm_bolt_talent) Spell(storm_bolt) - if BuffStacks(raging_blow_aura) ==2 or {BuffStacks(raging_blow_aura) and {target.DebuffPresent(colossus_smash) or SpellCooldown(colossus_smash) >=3 or {SpellCooldown(bloodthirst) >=1 and BuffRemains(raging_blow_aura) <=3 } } } Spell(raging_blow) - if BuffStacks(bloodsurge) and target.HealthPercent() >=20 Spell(wild_strike) + if BuffStacks(raging_blow_aura) ==2 or {BuffPresent(raging_blow_aura) and {target.DebuffPresent(colossus_smash) or SpellCooldown(colossus_smash) >=3 or {SpellCooldown(bloodthirst) >=1 and BuffRemains(raging_blow_aura) <=3 } } } Spell(raging_blow) + if BuffStacks(bloodsurge) Spell(wild_strike) if TalentPoints(shockwave_talent) Spell(shockwave) - Spell(heroic_throw) + if target.DebuffExpires(colossus_smash) Spell(heroic_throw) if Rage() <70 and not target.DebuffPresent(colossus_smash) Spell(battle_shout) if target.DebuffPresent(colossus_smash) and target.HealthPercent() >=20 Spell(wild_strike) if TalentPoints(impending_victory_talent) and target.HealthPercent() >=20 Spell(impending_victory) - if SpellCooldown(colossus_smash) >=1 and Rage() >=80 and target.HealthPercent() >=20 Spell(wild_strike) + if SpellCooldown(colossus_smash) >=2 and Rage() >=80 and target.HealthPercent() >=20 Spell(wild_strike) if Rage() <70 Spell(battle_shout) } AddIcon mastery=2 help=offgcd { if target.IsInterruptible() Spell(pummel) - if TalentPoints(bloodbath_talent) and {target.DebuffRemains(colossus_smash) >=5 and {target.DeadIn() >79 or {target.DeadIn() <79 and target.HealthPercent() <20 and {BuffPresent(recklessness) or SpellCooldown(recklessness) >={target.DeadIn() -25 } } } } } Spell(bloodbath) + if TalentPoints(bloodbath_talent) and {SpellCooldown(colossus_smash) <2 or target.DebuffRemains(colossus_smash) >=5 or target.DeadIn() <=20 } Spell(bloodbath) if not {BuffStacks(enrage) or {BuffStacks(raging_blow_aura) ==2 and target.HealthPercent() >=20 } } or {BuffRemains(recklessness) >=10 and not BuffStacks(raging_blow_aura) } Spell(berserker_rage) if target.DebuffPresent(colossus_smash) if CheckBoxOn(heroic_leap_check) Spell(heroic_leap) - if {not TalentPoints(bloodbath_talent) and Rage() >=40 } or {TalentPoints(bloodbath_talent) and BuffPresent(bloodbath) and Rage() >=40 } Spell(deadly_calm) - if {{{target.DebuffPresent(colossus_smash) and Rage() >=40 } or {BuffPresent(deadly_calm) and Rage() >=30 } } and target.HealthPercent() >=20 } or Rage() >=110 Spell(heroic_strike) if {{target.DebuffPresent(colossus_smash) and Rage() >=40 } and target.HealthPercent() >=20 } or Rage() >=110 Spell(heroic_strike) } AddIcon mastery=2 help=aoe @@ -225,11 +225,10 @@ AddIcon mastery=2 help=aoe } AddIcon mastery=2 help=cd { - if {{target.DebuffRemains(colossus_smash) >=5 or SpellCooldown(colossus_smash) <=4 } and {{not TalentPoints(avatar_talent) or not ArmorSetParts(T14 more 4) } and {{target.HealthPercent() <20 or target.DeadIn() >315 or {target.DeadIn() >165 and ArmorSetParts(T14 more 4) } } } or {TalentPoints(avatar_talent) and ArmorSetParts(T14 more 4) and BuffPresent(avatar) } } } and {not TalentPoints(bloodbath_talent) or SpellCooldown(bloodbath) <=3 or {{target.DeadIn() >315 and target.DeadIn() <{315 +SpellCooldown(bloodbath) } } or {ArmorSetParts(T14 more 4) and target.DeadIn() >165 and target.DeadIn() <{165 +SpellCooldown(bloodbath) } } } } or target.DeadIn() <=18 Spell(recklessness) - if TalentPoints(avatar_talent) and {{{SpellCooldown(recklessness) >=180 or BuffPresent(recklessness) } or {target.HealthPercent() >=20 and target.DeadIn() >195 } or {target.HealthPercent() <20 and ArmorSetParts(T14 more 4) } } or target.DeadIn() <=20 } Spell(avatar) - if {BuffPresent(recklessness) and not ArmorSetParts(T15 more 4) } or {not BuffPresent(recklessness) and ArmorSetParts(T15 more 4) } Spell(skull_banner) - if not TalentPoints(bloodbath_talent) or {TalentPoints(bloodbath_talent) and BuffPresent(bloodbath) } { Item(Trinket0Slot usable=1) Item(Trinket1Slot usable=1) } - if TalentPoints(bladestorm_talent) and SpellCooldown(colossus_smash) >=5 and not target.DebuffPresent(colossus_smash) and SpellCooldown(bloodthirst) >=2 and target.HealthPercent() >=20 Spell(bladestorm) + if {TalentPoints(avatar_talent) and {SpellCooldown(colossus_smash) <2 or target.DebuffRemains(colossus_smash) >=5 } } or {TalentPoints(bloodbath_talent) and {BuffPresent(bloodbath) and {target.DeadIn() >192 or target.HealthPercent() <20 } } } or target.DeadIn() <=12 Spell(recklessness) + if BuffPresent(recklessness) and TalentPoints(avatar_talent) Spell(avatar) + if BuffPresent(recklessness) Spell(skull_banner) + if {not TalentPoints(bloodbath_talent) and target.DebuffPresent(colossus_smash) } or {TalentPoints(bloodbath_talent) and BuffPresent(bloodbath) } { Item(Trinket0Slot usable=1) Item(Trinket1Slot usable=1) } } AddIcon mastery=3 help=main { @@ -247,8 +246,7 @@ AddIcon mastery=3 help=main AddIcon mastery=3 help=offgcd { if target.IsInterruptible() Spell(pummel) - Spell(deadly_calm) - if {{BuffPresent(ultimatum) or {BuffPresent(deadly_calm) and Rage() >=30 } } and target.HealthPercent() >=20 } Spell(heroic_strike) + if {BuffPresent(ultimatum) and target.HealthPercent() >=20 } Spell(heroic_strike) if Rage() <90 Spell(berserker_rage) if BuffExpires(shield_block_aura) Spell(shield_block) if BuffExpires(shield_barrier) and Rage() >80 Spell(shield_barrier) diff --git a/defaut/Mage.lua b/defaut/Mage.lua index 944ab3a..d843457 100644 --- a/defaut/Mage.lua +++ b/defaut/Mage.lua @@ -30,9 +30,6 @@ Define(combustion 11129) Define(conjure_mana_gem 759) Define(counterspell 2139) SpellInfo(counterspell duration=6 cd=24 ) -Define(evocation 12051) - SpellInfo(evocation duration=6 cd=120 ) - SpellAddBuff(evocation evocation=1) Define(fingers_of_frost_aura 44544) SpellInfo(fingers_of_frost_aura duration=15 ) SpellAddBuff(fingers_of_frost_aura fingers_of_frost_aura=1) @@ -64,9 +61,6 @@ Define(ignite 12654) SpellAddTargetDebuff(ignite ignite=1) Define(inferno_blast 108853) SpellInfo(inferno_blast cd=8 ) -Define(invokers_energy 116257) - SpellInfo(invokers_energy duration=40 ) - SpellAddBuff(invokers_energy invokers_energy=1) Define(living_bomb 44457) SpellInfo(living_bomb duration=12 tick=3 ) SpellAddTargetDebuff(living_bomb living_bomb=1) @@ -94,9 +88,6 @@ Define(time_warp 35346) SpellInfo(time_warp duration=6 cd=15 ) SpellAddBuff(time_warp time_warp=1) Define(water_elemental 63859) -Define(water_elemental_freeze 33395) - SpellInfo(water_elemental_freeze duration=8 cd=25 ) - SpellAddBuff(water_elemental_freeze water_elemental_freeze=1) AddIcon mastery=1 help=main { if not InCombat() @@ -106,27 +97,27 @@ AddIcon mastery=1 help=main Spell(rune_of_power) } if ItemCharges(36799) <3 and False() Spell(conjure_mana_gem) + if BuffRemains(rune_of_power) <CastTime(rune_of_power) Spell(rune_of_power) + if SpellCooldown(arcane_power) ==0 and BuffRemains(rune_of_power) <BuffDuration(arcane_power) Spell(rune_of_power) if BuffPresent(alter_time) and BuffRemains(alter_time) <2 Spell(arcane_barrage) - if BuffPresent(alter_time) or BuffStacks(arcane_missiles_aura) ==2 Spell(arcane_missiles) - if BuffRemains(rune_of_power) <=2 and BuffExpires(alter_time) Spell(rune_of_power) + if BuffPresent(alter_time) Spell(arcane_missiles) + if BuffPresent(alter_time) Spell(arcane_blast) + if {BuffStacks(arcane_missiles_aura) ==2 and SpellCooldown(arcane_power) >0 } or {BuffStacks(arcane_charge) >=4 and SpellCooldown(arcane_power) >8 } Spell(arcane_missiles) if {not target.DebuffPresent(living_bomb) or target.DebuffRemains(living_bomb) <TickTime(living_bomb) } and target.DeadIn() >TickTime(living_bomb) *3 Spell(living_bomb) - if ManaPercent() >92 or BuffPresent(alter_time) or BuffRemains(arcane_charge) <3 Spell(arcane_blast) - if BuffStacks(arcane_missiles_aura) and {SpellCooldown(alter_time_activate) >4 or target.DeadIn() <10 } Spell(arcane_missiles) - if {SpellCooldown(mana_gem) <=9 and not ManaPercent() <=80 } or target.DeadIn() <30 Spell(arcane_blast) - if BuffExpires(alter_time) Spell(scorch) + if BuffStacks(arcane_charge) >=4 and ManaPercent() <95 Spell(arcane_barrage) + Spell(arcane_blast) } AddIcon mastery=1 help=offgcd { if target.IsInterruptible() if target.IsInterruptible() Spell(counterspell) cancel.Spell(alter_time) if target.HealthPercent() <25 or TimeInCombat() >5 Spell(time_warp) - if BuffExpires(alter_time) and BuffPresent(arcane_power) and BuffStacks(arcane_missiles_aura) ==2 and BuffStacks(arcane_charge) >3 and BuffRemains(rune_of_power) >6 Spell(alter_time) if ManaPercent() <80 and BuffExpires(alter_time) Spell(mana_gem) + if BuffExpires(alter_time) and BuffPresent(arcane_power) Spell(alter_time) } AddIcon mastery=1 help=moving { - if BuffPresent(arcane_charge) and BuffRemains(arcane_charge) <=2 Spell(arcane_barrage) - Spell(scorch) + Spell(arcane_barrage) Spell(fire_blast) Spell(ice_lance) } @@ -136,13 +127,11 @@ AddIcon mastery=1 help=cd { Spell(mirror_image) } - if target.DeadIn() <18 Spell(arcane_power) - if target.DeadIn() <18 Spell(berserking) - if BuffExpires(alter_time) { Item(Trinket0Slot usable=1) Item(Trinket1Slot usable=1) } - if SpellCooldown(alter_time_activate) >45 or target.DeadIn() <25 and BuffRemains(rune_of_power) >20 { Item(Trinket0Slot usable=1) Item(Trinket1Slot usable=1) } Spell(mirror_image) - if BuffRemains(rune_of_power) >15 and BuffExpires(alter_time) and BuffStacks(arcane_charge) >1 Spell(arcane_power) - if BuffRemains(rune_of_power) >10 and BuffExpires(alter_time) and BuffStacks(arcane_charge) >2 Spell(berserking) + if {BuffRemains(rune_of_power) >=BuffDuration(arcane_power) and BuffStacks(arcane_missiles_aura) ==2 and BuffStacks(arcane_charge) >2 } or target.DeadIn() <BuffDuration(arcane_power) +5 Spell(arcane_power) + if BuffExpires(alter_time) and {BuffPresent(arcane_power) or target.DeadIn() <18 } Spell(berserking) + if BuffExpires(alter_time) { Item(Trinket0Slot usable=1) Item(Trinket1Slot usable=1) } + if {SpellCooldown(alter_time_activate) >45 or target.DeadIn() <25 } and BuffRemains(rune_of_power) >20 { Item(Trinket0Slot usable=1) Item(Trinket1Slot usable=1) } } AddIcon mastery=2 help=main { @@ -150,10 +139,12 @@ AddIcon mastery=2 help=main { if BuffExpires(arcane_brilliance) Spell(arcane_brilliance) Spell(molten_armor) + Spell(rune_of_power) } if ItemCharges(36799) <3 and False() Spell(conjure_mana_gem) - if BuffStacks(pyroblast_aura) and {SpellCooldown(alter_time_activate) >4 or BuffStacks(heating_up) } Spell(pyroblast) - if BuffPresent(presence_of_mind) and SpellCooldown(alter_time_activate) >4 Spell(pyroblast) + if BuffRemains(rune_of_power) <CastTime(rune_of_power) and BuffExpires(alter_time) Spell(rune_of_power) + if SpellCooldown(alter_time_activate) ==0 and BuffRemains(rune_of_power) <6 Spell(rune_of_power) + if BuffStacks(pyroblast_aura) or BuffPresent(presence_of_mind) Spell(pyroblast) if BuffStacks(heating_up) and BuffExpires(pyroblast_aura) Spell(inferno_blast) if {not target.DebuffPresent(living_bomb) or target.DebuffRemains(living_bomb) <TickTime(living_bomb) } and target.DeadIn() >TickTime(living_bomb) *3 Spell(living_bomb) if not target.DebuffPresent(pyroblast_aura) Spell(pyroblast) @@ -166,29 +157,22 @@ AddIcon mastery=2 help=offgcd if target.HealthPercent() <25 or TimeInCombat() >5 Spell(time_warp) if target.DeadIn() <22 Spell(combustion) if LastSpellDamage(ignite) >={{CritDamage(fireball) +CritDamage(inferno_blast) +Damage(pyroblast) } *{Mastery() /100} *0.5 } and target.DebuffPresent(pyroblast_aura) Spell(combustion) - if ManaPercent() <84 and BuffExpires(alter_time) Spell(mana_gem) - if BuffExpires(alter_time) and BuffStacks(pyroblast_aura) and BuffRemains(invokers_energy) >6 Spell(alter_time) + if BuffExpires(alter_time) and BuffStacks(pyroblast_aura) Spell(alter_time) } AddIcon mastery=2 help=moving { - Spell(inferno_blast) - Spell(ice_lance) + Spell(scorch) } AddIcon mastery=2 help=cd { if not InCombat() { - Spell(evocation) Spell(mirror_image) } - if BuffRemains(invokers_energy) >10 and BuffExpires(alter_time) and ManaPercent() >28 Spell(berserking) - if BuffExpires(invokers_energy) and BuffExpires(alter_time) Spell(evocation) - if target.DeadIn() <18 Spell(berserking) - if BuffExpires(alter_time) { Item(Trinket0Slot usable=1) Item(Trinket1Slot usable=1) } - if SpellCooldown(alter_time_activate) >45 or target.DeadIn() <25 and BuffRemains(invokers_energy) >20 { Item(Trinket0Slot usable=1) Item(Trinket1Slot usable=1) } - if ManaPercent() <10 and target.DeadIn() >=30 Spell(evocation) - Spell(mirror_image) + if BuffExpires(alter_time) and target.DeadIn() <18 Spell(berserking) + if BuffExpires(alter_time) Spell(berserking) if BuffExpires(alter_time) Spell(presence_of_mind) + if SpellCooldown(alter_time) >30 or target.DeadIn() <15 Spell(presence_of_mind) } AddIcon mastery=3 help=main { @@ -196,18 +180,17 @@ AddIcon mastery=3 help=main { if BuffExpires(arcane_brilliance) Spell(arcane_brilliance) if BuffExpires(frost_armor) Spell(frost_armor) + Spell(rune_of_power) } if ItemCharges(36799) <3 and False() Spell(conjure_mana_gem) + if BuffRemains(rune_of_power) <CastTime(rune_of_power) and BuffExpires(alter_time) Spell(rune_of_power) + if SpellCooldown(icy_veins) ==0 and BuffRemains(rune_of_power) <20 Spell(rune_of_power) + if not BuffStacks(fingers_of_frost_aura) Spell(frozen_orb) if BuffPresent(alter_time) and BuffPresent(brain_freeze) Spell(frostfire_bolt) - if BuffPresent(alter_time) and BuffStacks(fingers_of_frost_aura) Spell(ice_lance) - if BuffPresent(alter_time) and BuffPresent(presence_of_mind) Spell(frostbolt) - if target.DeadIn() >=4 and BuffStacks(fingers_of_frost_aura) <2 and SpellCooldown(icy_veins) <GCD() and BuffRemains(invokers_energy) >20 and BuffExpires(alter_time) Spell(frozen_orb) - if BuffPresent(brain_freeze) and {{target.DebuffPresent(frost_bomb) and target.DebuffRemains(frost_bomb) <2 } or BuffRemains(brain_freeze) <2 } Spell(frostfire_bolt) - if BuffStacks(fingers_of_frost_aura) and BuffRemains(fingers_of_frost_aura) <2 Spell(ice_lance) + if BuffPresent(alter_time) and BuffPresent(fingers_of_frost_aura) Spell(ice_lance) if target.DebuffStacks(frostbolt) <3 Spell(frostbolt) - if BuffStacks(fingers_of_frost_aura) Spell(ice_lance) - if BuffPresent(brain_freeze) and {BuffPresent(alter_time) or SpellCooldown(alter_time_activate) >4 } Spell(frostfire_bolt) - if target.DeadIn() >=4 and BuffStacks(fingers_of_frost_aura) <2 Spell(frozen_orb) + if BuffStacks(brain_freeze) and SpellCooldown(icy_veins) >2 Spell(frostfire_bolt) + if BuffStacks(fingers_of_frost_aura) and SpellCooldown(icy_veins) >2 Spell(ice_lance) Spell(frostbolt) } AddIcon mastery=3 help=offgcd @@ -219,11 +202,8 @@ AddIcon mastery=3 help=offgcd if target.IsInterruptible() if target.IsInterruptible() Spell(counterspell) cancel.Spell(alter_time) if target.HealthPercent() <25 or TimeInCombat() >5 Spell(time_warp) - if BuffExpires(alter_time) and BuffStacks(fingers_of_frost_aura) <2 Spell(water_elemental_freeze) - if not target.DebuffPresent(frost_bomb) and target.DeadIn() >CastTime(frost_bomb) +TickTime(frost_bomb) Spell(frost_bomb) - if BuffExpires(alter_time) and BuffPresent(brain_freeze) and BuffStacks(fingers_of_frost_aura) and BuffRemains(invokers_energy) >6 Spell(alter_time) - if BuffExpires(alter_time) and BuffPresent(brain_freeze) and BuffStacks(fingers_of_frost_aura) Spell(alter_time) - if ManaPercent() <84 and BuffExpires(alter_time) Spell(mana_gem) + if BuffExpires(alter_time) and BuffPresent(icy_veins) Spell(alter_time) + if target.DeadIn() >CastTime(frost_bomb) +TickTime(frost_bomb) Spell(frost_bomb) } AddIcon mastery=3 help=moving { @@ -234,18 +214,12 @@ AddIcon mastery=3 help=cd { if not InCombat() { - Spell(evocation) Spell(mirror_image) } - if BuffExpires(alter_time) Spell(presence_of_mind) - if target.DeadIn() <22 Spell(icy_veins) - if target.DeadIn() <18 Spell(berserking) - if ArmorSetParts(T14 more 4) and BuffRemains(invokers_energy) >20 and BuffExpires(alter_time) Spell(icy_veins) - if not ArmorSetParts(T14 more 4) and target.DebuffPresent(frozen_orb) Spell(icy_veins) - if target.DebuffPresent(frozen_orb) and BuffExpires(alter_time) Spell(icy_veins) Spell(mirror_image) - if BuffExpires(invokers_energy) and BuffExpires(alter_time) Spell(evocation) - if BuffRemains(invokers_energy) >10 and BuffExpires(alter_time) and ManaPercent() >28 Spell(berserking) + if {target.DebuffStacks(frostbolt) >=3 and {BuffStacks(brain_freeze) or BuffStacks(fingers_of_frost_aura) } } or target.DeadIn() <22 Spell(icy_veins) + if BuffPresent(icy_veins) or target.DeadIn() <18 Spell(berserking) + if BuffPresent(icy_veins) or SpellCooldown(icy_veins) >15 or target.DeadIn() <15 Spell(presence_of_mind) } ]] diff --git a/defaut/Moine.lua b/defaut/Moine.lua index db6b060..ef9eb88 100644 --- a/defaut/Moine.lua +++ b/defaut/Moine.lua @@ -8,6 +8,8 @@ Define(chi_brew 115399) SpellInfo(chi_brew chi=-4 cd=90 ) Define(chi_sphere 121286) SpellInfo(chi_sphere duration=120 ) +Define(chi_wave 115098) + SpellInfo(chi_wave cd=15 ) Define(combo_breaker_bok 116768) SpellInfo(combo_breaker_bok duration=15 ) SpellAddBuff(combo_breaker_bok combo_breaker_bok=1) @@ -45,6 +47,7 @@ Define(tigereye_brew_use 116740) SpellAddBuff(tigereye_brew_use tigereye_brew_use=1) Define(ascension_talent 8) Define(chi_brew_talent 9) +Define(chi_wave_talent 4) Define(invoke_xuen_the_white_tiger_talent 17) Define(power_strikes_talent 7) Define(rushing_jade_wind_talent 16) @@ -58,22 +61,21 @@ AddIcon mastery=3 help=main if BuffRemains(tiger_power) <=3 Spell(tiger_palm) if TalentPoints(rushing_jade_wind_talent) Spell(rushing_jade_wind) - if BuffStacks(combo_breaker_bok) and TimeToMaxEnergy() <2 Spell(blackout_kick) + if BuffStacks(combo_breaker_bok) and TimeToMaxEnergy() <=2 Spell(blackout_kick) Spell(rising_sun_kick) - if {Chi() >=3 and TimeToMaxEnergy() <=2 and not TalentPoints(ascension_talent) } or {Chi() >=4 and TimeToMaxEnergy() <=2 and TalentPoints(ascension_talent) } Spell(blackout_kick) if not BuffPresent(energizing_brew) and TimeToMaxEnergy() >{4 } and BuffRemains(tiger_power) >{4 } Spell(fists_of_fury) if BuffStacks(combo_breaker_bok) Spell(blackout_kick) - if BuffStacks(combo_breaker_tp) Spell(tiger_palm) + if {BuffStacks(combo_breaker_tp) and TimeToMaxEnergy() >=2 } or {BuffRemains(combo_breaker_tp) <=2 and BuffStacks(combo_breaker_tp) } Spell(tiger_palm) + if TalentPoints(chi_wave_talent) and TimeToMaxEnergy() >2 Spell(chi_wave) if TalentPoints(ascension_talent) and Chi() <=3 Spell(jab) if not TalentPoints(ascension_talent) and Chi() <=2 Spell(jab) - if {{Energy() +{EnergyRegen() *{SpellCooldown(rising_sun_kick) } } } >=40 } or {Chi() ==4 and not TalentPoints(ascension_talent) } or {Chi() ==5 and TalentPoints(ascension_talent) } Spell(blackout_kick) + if {Energy() +{EnergyRegen() *{SpellCooldown(rising_sun_kick) } } } >=40 Spell(blackout_kick) } AddIcon mastery=3 help=offgcd { if TalentPoints(power_strikes_talent) and BuffStacks(chi_sphere) and Chi() <4 Spell(chi_sphere) - if PTR() ==0 and not BuffPresent(tigereye_brew_use) and BuffStacks(tigereye_brew) ==10 Spell(tigereye_brew) - if PTR() ==1 and not BuffPresent(tigereye_brew_use) Spell(tigereye_brew) + if not BuffPresent(tigereye_brew_use) Spell(tigereye_brew) if TimeToMaxEnergy() >5 Spell(energizing_brew) } AddIcon mastery=3 help=aoe diff --git a/defaut/Paladin.lua b/defaut/Paladin.lua index 2fa36b3..b02b5bd 100644 --- a/defaut/Paladin.lua +++ b/defaut/Paladin.lua @@ -10,16 +10,21 @@ Define(blessing_of_might 19740) SpellAddBuff(blessing_of_might blessing_of_might=1) Define(crusader_strike 35395) SpellInfo(crusader_strike holy=-1 cd=4.5 ) +Define(divine_storm 53385) + SpellInfo(divine_storm holy=3 ) Define(execution_sentence 114916) SpellInfo(execution_sentence duration=10 tick=1 ) SpellAddTargetDebuff(execution_sentence execution_sentence=1) Define(exorcism 879) SpellInfo(exorcism holy=-1 cd=15 ) -Define(exorcism_glyphed 122032) - SpellInfo(exorcism_glyphed holy=-1 cd=15) +Define(glyph_of_double_jeopardy 121027) + SpellInfo(glyph_of_double_jeopardy duration=10 ) + SpellAddBuff(glyph_of_double_jeopardy glyph_of_double_jeopardy=1) Define(guardian_of_ancient_kings 86659) SpellInfo(guardian_of_ancient_kings duration=12 cd=180 ) SpellAddBuff(guardian_of_ancient_kings guardian_of_ancient_kings=1) +Define(hammer_of_the_righteous 53595) + SpellInfo(hammer_of_the_righteous holy=-1 cd=4.5 ) Define(hammer_of_wrath 24275) SpellInfo(hammer_of_wrath holy=-0 cd=6 ) Define(inquisition 84963) @@ -29,13 +34,12 @@ Define(judgment 20271) SpellInfo(judgment cd=6 ) Define(rebuke 96231) SpellInfo(rebuke duration=4 cd=15 ) -Define(seal_of_insight 20165) - SpellAddBuff(seal_of_insight seal_of_insight=1) +Define(seal_of_righteousness 20154) + SpellAddBuff(seal_of_righteousness seal_of_righteousness=1) Define(seal_of_truth 31801) SpellAddBuff(seal_of_truth seal_of_truth=1) Define(templars_verdict 85256) SpellInfo(templars_verdict holy=3 ) -Define(glyph_of_mass_exorcism 122028) AddCheckBox(showwait L(showwait) default) AddIcon mastery=3 help=main { @@ -45,24 +49,34 @@ AddIcon mastery=3 help=main if not BuffPresent(mastery any=1) and not BuffPresent(str_agi_int any=1) Spell(blessing_of_might) unless Stance(1) Spell(seal_of_truth) } - if ManaPercent() >=90 or Stance(0) unless Stance(1) Spell(seal_of_truth) - if ManaPercent() <=30 unless Stance(4) Spell(seal_of_insight) - if {BuffExpires(inquisition) or BuffRemains(inquisition) <=2 } and {HolyPower() >=3 } Spell(inquisition) + if {BuffExpires(inquisition) or BuffRemains(inquisition) <=2 } and {HolyPower() >=3 or target.DeadIn() <HolyPower() *10 } Spell(inquisition) if HolyPower() ==5 Spell(templars_verdict) Spell(hammer_of_wrath usable=1) if SpellCooldown(hammer_of_wrath) >0 and SpellCooldown(hammer_of_wrath) <=0.2 if CheckBoxOn(showwait) Texture(Spell_nature_timestop) - if Glyph(glyph_of_mass_exorcism no) Spell(exorcism) - if Glyph(glyph_of_mass_exorcism) Spell(exorcism_glyphed) - if target.HealthPercent() <=20 or BuffPresent(avenging_wrath) Spell(judgment) + Spell(exorcism) + if SpellCooldown(exorcism) >0 and SpellCooldown(exorcism) <=0.2 if CheckBoxOn(showwait) Texture(Spell_nature_timestop) + if not {ArmorSetParts(T15 more 4) } and {target.HealthPercent() <=20 or BuffPresent(avenging_wrath) } Spell(judgment) Spell(crusader_strike) + if SpellCooldown(crusader_strike) >0 and SpellCooldown(crusader_strike) <=0.2 if CheckBoxOn(showwait) Texture(Spell_nature_timestop) Spell(judgment) - if HolyPower() >=3 Spell(templars_verdict) + if BuffRemains(inquisition) >4 Spell(templars_verdict) } AddIcon mastery=3 help=offgcd { if target.IsInterruptible() Spell(rebuke) if BuffPresent(inquisition) Spell(execution_sentence) } +AddIcon mastery=3 help=aoe +{ + if not InCombat() + { + unless Stance(2) Spell(seal_of_righteousness) + } + if {HolyPower() ==5 } Spell(divine_storm) + Spell(hammer_of_the_righteous) + if BuffPresent(glyph_of_double_jeopardy) focus.Spell(judgment) + if BuffRemains(inquisition) >4 Spell(divine_storm) +} AddIcon mastery=3 help=cd { if BuffPresent(inquisition) Spell(avenging_wrath) diff --git a/defaut/Pretre.lua b/defaut/Pretre.lua index ffbd307..d79bb60 100644 --- a/defaut/Pretre.lua +++ b/defaut/Pretre.lua @@ -25,7 +25,9 @@ Define(mind_blast 8092) Define(mind_flay 15407) SpellInfo(mind_flay duration=3 canStopChannelling=1 ) SpellAddTargetDebuff(mind_flay mind_flay=1) -Define(mind_flay_insanity 129197) +Define(mind_flay_(insanity) 129197) + SpellInfo(mind_flay_(insanity) duration=3 tick=1 canStopChannelling=1 ) + SpellAddTargetDebuff(mind_flay_(insanity) mind_flay_(insanity)=1) Define(mind_sear 48045) SpellInfo(mind_sear duration=5 canStopChannelling=1 ) SpellAddBuff(mind_sear mind_sear=1) @@ -40,7 +42,6 @@ Define(power_word_fortitude 21562) SpellAddBuff(power_word_fortitude power_word_fortitude=1) Define(shadow_word_death 32379) SpellInfo(shadow_word_death cd=8 ) -Define(shadow_word_insanity 129249) Define(shadow_word_pain 589) SpellInfo(shadow_word_pain duration=18 ) SpellAddTargetDebuff(shadow_word_pain shadow_word_pain=1) @@ -62,8 +63,6 @@ Define(divine_star_talent 17) Define(halo_talent 18) Define(mindbender_talent 8) Define(power_infusion_talent 14) -Define(power_word_solace_talent 9) -Define(solace_and_insanity_talent 13) AddCheckBox(showwait L(showwait) default) AddIcon mastery=3 help=main { @@ -76,12 +75,12 @@ AddIcon mastery=3 help=main if BuffExpires(shadowform) Spell(shadowform) if TalentPoints(mindbender_talent) Spell(mindbender) if ShadowOrbs() ==3 and {SpellCooldown(mind_blast) <1.5 or target.HealthPercent() <20 and SpellCooldown(shadow_word_death) <1.5 } Spell(devouring_plague) - if PTR() and TalentPoints(solace_and_insanity_talent) Spell(mind_flay_insanity) if target.HealthPercent(less 20) Spell(shadow_word_death) if SpellCooldown(mind_blast) Spell(mind_blast) + if target.TicksRemain(devouring_plague) ==1 Spell(mind_flay_(insanity)) + Spell(mind_flay_(insanity)) if not target.DebuffPresent(shadow_word_pain) Spell(shadow_word_pain) if target.DebuffRemains(vampiric_touch) <CastTime(vampiric_touch) Spell(vampiric_touch) - if not PTR() and TalentPoints(power_word_solace_talent) Spell(shadow_word_insanity) if BuffStacks(surge_of_darkness) ==2 Spell(mind_spike) if target.TicksRemain(shadow_word_pain) <=1 Spell(shadow_word_pain) if target.DebuffRemains(vampiric_touch) <CastTime(vampiric_touch) +TickTime(vampiric_touch) Spell(vampiric_touch) diff --git a/defaut/Voleur.lua b/defaut/Voleur.lua index 8a3401b..ff076bf 100644 --- a/defaut/Voleur.lua +++ b/defaut/Voleur.lua @@ -31,7 +31,7 @@ Define(hemorrhage 16511) SpellInfo(hemorrhage energy=30 combo=1 buff_combo=shadow_blades ) Define(honor_among_thieves 51701) Define(kick 1766) - SpellInfo(kick duration=5 energy=10 cd=15 ) + SpellInfo(kick duration=5 cd=15 ) Define(killing_spree 51690) SpellInfo(killing_spree duration=3 cd=120 ) SpellAddBuff(killing_spree killing_spree=1) @@ -67,7 +67,7 @@ Define(tricks_of_the_trade 57933) SpellInfo(tricks_of_the_trade duration=6 ) SpellAddBuff(tricks_of_the_trade tricks_of_the_trade=1) Define(vanish 1856) - SpellInfo(vanish cd=180 ) + SpellInfo(vanish cd=120 ) SpellAddBuff(vanish vanish=1) Define(vendetta 79140) SpellInfo(vendetta duration=20 cd=120 ) @@ -76,7 +76,6 @@ Define(weakened_armor 113746) SpellInfo(weakened_armor duration=30 ) SpellAddBuff(weakened_armor weakened_armor=1) Define(anticipation_talent 18) -Define(preparation_talent 10) Define(shadow_focus_talent 3) Define(subterfuge_talent 2) AddIcon mastery=1 help=main @@ -107,7 +106,7 @@ AddIcon mastery=1 help=offgcd } AddIcon mastery=1 help=cd { - if TalentPoints(preparation_talent) and not BuffPresent(vanish) and SpellCooldown(vanish) >60 Spell(preparation) + if not BuffPresent(vanish) and SpellCooldown(vanish) >60 Spell(preparation) { Item(Trinket0Slot usable=1) Item(Trinket1Slot usable=1) } Spell(berserking) if TimeInCombat() >10 and not BuffPresent(stealthed) and not BuffPresent(shadow_blades) Spell(vanish) @@ -149,7 +148,7 @@ AddIcon mastery=2 help=offgcd } AddIcon mastery=2 help=cd { - if TalentPoints(preparation_talent) and not BuffPresent(vanish) and SpellCooldown(vanish) >60 Spell(preparation) + if not BuffPresent(vanish) and SpellCooldown(vanish) >60 Spell(preparation) if TimeInCombat() ==0 or BuffPresent(shadow_blades) { Item(Trinket0Slot usable=1) Item(Trinket1Slot usable=1) } if TimeInCombat() ==0 or BuffPresent(shadow_blades) Spell(berserking) if TimeInCombat() >10 and {ComboPoints() <3 or {TalentPoints(anticipation_talent) and BuffStacks(anticipation) <3 } or {BuffExpires(shadow_blades) and {ComboPoints() <4 or {TalentPoints(anticipation_talent) and BuffStacks(anticipation) <4 } } } } and {{TalentPoints(shadow_focus_talent) and BuffExpires(adrenaline_rush) and Energy() <20 } or {TalentPoints(subterfuge_talent) and Energy() >=90 } or {not TalentPoints(shadow_focus_talent) and not TalentPoints(subterfuge_talent) and Energy() >=60 } } Spell(vanish) @@ -192,7 +191,7 @@ AddIcon mastery=3 help=offgcd } AddIcon mastery=3 help=cd { - if TalentPoints(preparation_talent) and not BuffPresent(vanish) and SpellCooldown(vanish) >60 Spell(preparation) + if not BuffPresent(vanish) and SpellCooldown(vanish) >60 Spell(preparation) Spell(shadow_blades) if BuffPresent(shadow_dance) { Item(Trinket0Slot usable=1) Item(Trinket1Slot usable=1) } if BuffPresent(shadow_dance) Spell(berserking)