diff --git a/defaut/Chaman.lua b/defaut/Chaman.lua
index 5faf105..0c3f577 100644
--- a/defaut/Chaman.lua
+++ b/defaut/Chaman.lua
@@ -18,8 +18,8 @@ Define(earth_elemental_totem 2062)
SpellInfo(earth_elemental_totem duration=60 cd=300 )
Define(earth_shock 8042)
SpellInfo(earth_shock sharedcd=shock cd=6 )
-Define(earthquake 77478)
- SpellInfo(earthquake duration=3 )
+Define(earthquake 61882)
+ SpellInfo(earthquake duration=10 cd=10 )
SpellAddBuff(earthquake earthquake=1)
Define(elemental_blast 117014)
SpellInfo(elemental_blast cd=12 )
@@ -30,7 +30,8 @@ Define(feral_spirit 51533)
SpellInfo(feral_spirit duration=30 cd=120 )
Define(fire_elemental_totem 2894)
SpellInfo(fire_elemental_totem duration=60 cd=300 )
-Define(fire_nova 8349)
+Define(fire_nova 1535)
+ SpellInfo(fire_nova cd=4 )
Define(flame_shock 8050)
SpellInfo(flame_shock duration=24 tick=3 sharedcd=shock cd=6 )
SpellAddTargetDebuff(flame_shock flame_shock=1)
@@ -41,8 +42,9 @@ Define(lava_burst 51505)
Define(lava_lash 60103)
SpellInfo(lava_lash cd=10 )
Define(lightning_bolt 403)
-Define(lightning_shield 26364)
- SpellInfo(lightning_shield cd=3 )
+Define(lightning_shield 324)
+ SpellInfo(lightning_shield duration=3600 )
+ SpellAddBuff(lightning_shield lightning_shield=1)
Define(maelstrom_weapon 51530)
Define(magma_totem 8187)
Define(searing_totem 3599)
@@ -79,6 +81,7 @@ AddIcon mastery=1 help=main
if not InCombat()
{
if WeaponEnchantExpires(mainhand) main.Spell(flametongue_weapon)
+ if not BuffPresent(lightning_shield) Spell(lightning_shield)
}
{
@@ -97,6 +100,7 @@ AddIcon mastery=1 help=main
if not TotemPresent(fire) Spell(searing_totem)
if not target.DebuffPresent(flame_shock) Spell(flame_shock)
if target.DebuffRemains(flame_shock) >CastTime(lava_burst) and SpellCooldown(lava_burst) Spell(lava_burst)
+ if Enemies() >4 Spell(earthquake)
if ManaPercent() <80 Spell(thunderstorm)
if ManaPercent() >10 Spell(chain_lightning)
Spell(lightning_bolt)
@@ -104,10 +108,6 @@ AddIcon mastery=1 help=main
}
AddIcon mastery=1 help=offgcd
{
- if not InCombat()
- {
- if not BuffPresent(lightning_shield) Spell(lightning_shield)
- }
if target.IsInterruptible() Spell(wind_shear)
{
@@ -116,7 +116,6 @@ AddIcon mastery=1 help=offgcd
if Enemies() >1
{
if Enemies() >2 and not TotemPresent(fire) Spell(magma_totem)
- if Enemies() >4 Spell(earthquake)
}
}
AddIcon mastery=1 help=moving
@@ -136,7 +135,7 @@ AddIcon mastery=1 help=cd
if TalentPoints(elemental_mastery_talent) and TimeInCombat() >15 and {{not BuffPresent(bloodlust) and TimeInCombat() <120 } or {not BuffPresent(berserking) and not BuffPresent(bloodlust) and BuffPresent(ascendance) } or {TimeInCombat() >=200 and {SpellCooldown(ascendance) >30 or Level() <87 } } } Spell(elemental_mastery)
if not TotemPresent(fire) Spell(fire_elemental_totem)
if target.DebuffRemains(flame_shock) >0 and {target.DeadIn() <20 or BuffPresent(bloodlust) or TimeInCombat() >=180 } Spell(ascendance)
- if not Spell(earth_elemental_totem)
+ if not and SpellCooldown(fire_elemental_totem) >=50 Spell(earth_elemental_totem)
Spell(spiritwalkers_grace)
}
if Enemies() >1
@@ -150,6 +149,7 @@ AddIcon mastery=2 help=main
{
main.Spell(windfury_weapon)
if WeaponEnchantExpires(offhand) off.Spell(flametongue_weapon)
+ if not BuffPresent(lightning_shield) Spell(lightning_shield)
}
{
@@ -171,6 +171,7 @@ AddIcon mastery=2 help=main
if Enemies() >1
{
if not TotemPresent(fire) Spell(searing_totem)
+ if {DebuffCount(flame_shock) ==Enemies() } or DebuffCount(flame_shock) >=5 Spell(fire_nova)
if target.DebuffPresent(flame_shock) Spell(lava_lash)
if Enemies() >2 and BuffPresent(maelstrom_weapon) >=3 Spell(chain_lightning)
Spell(unleash_elements)
@@ -184,10 +185,6 @@ AddIcon mastery=2 help=main
}
AddIcon mastery=2 help=offgcd
{
- if not InCombat()
- {
- if not BuffPresent(lightning_shield) Spell(lightning_shield)
- }
if target.IsInterruptible() Spell(wind_shear)
{
@@ -196,7 +193,6 @@ AddIcon mastery=2 help=offgcd
if Enemies() >1
{
if Enemies() >5 and not TotemPresent(fire) Spell(magma_totem)
- if {DebuffCount(flame_shock) ==Enemies() } or DebuffCount(flame_shock) >=5 Spell(fire_nova)
}
}
AddIcon mastery=2 help=cd
@@ -210,7 +206,7 @@ AddIcon mastery=2 help=cd
if not TotemPresent(fire) and {BuffPresent(bloodlust) or BuffPresent(elemental_mastery) or target.DeadIn() <=0 +10 or {TalentPoints(elemental_mastery_talent) and {SpellCooldown(elemental_mastery) ==0 or SpellCooldown(elemental_mastery) >80 } or TimeInCombat() >=60 } } Spell(fire_elemental_totem)
if SpellCooldown(strike) >=3 Spell(ascendance)
Spell(feral_spirit)
- if not Spell(earth_elemental_totem)
+ if not and SpellCooldown(fire_elemental_totem) >=50 Spell(earth_elemental_totem)
Spell(spiritwalkers_grace)
}
if Enemies() >1
diff --git a/defaut/Chasseur.lua b/defaut/Chasseur.lua
index a88d7a7..7c2a320 100644
--- a/defaut/Chasseur.lua
+++ b/defaut/Chasseur.lua
@@ -4,8 +4,10 @@ Define(aimed_shot 19434)
Define(arcane_shot 3044)
SpellInfo(arcane_shot focus=20 )
Define(aspect_of_the_fox 82661)
+ SpellInfo(aspect_of_the_fox cd=1 )
SpellAddBuff(aspect_of_the_fox aspect_of_the_fox=1)
Define(aspect_of_the_hawk 13165)
+ SpellInfo(aspect_of_the_hawk cd=1 )
SpellAddBuff(aspect_of_the_hawk aspect_of_the_hawk=1)
Define(barrage 120360)
SpellInfo(barrage duration=3 focus=30 cd=30 )
@@ -27,7 +29,7 @@ Define(chimera_shot 53209)
Define(cobra_shot 77767)
SpellInfo(cobra_shot focus=-14 )
Define(dire_beast 120679)
- SpellInfo(dire_beast cd=30 )
+ SpellInfo(dire_beast duration=15 cd=30 )
Define(explosive_shot 53301)
SpellInfo(explosive_shot duration=2 focus=25 tick=1 cd=6 )
SpellAddTargetDebuff(explosive_shot explosive_shot=1)
@@ -51,6 +53,7 @@ Define(kill_command 34026)
SpellAddBuff(kill_command kill_command=1)
Define(kill_shot 53351)
SpellInfo(kill_shot cd=10 )
+Define(lock_and_load 56343)
Define(lynx_rush 120697)
SpellInfo(lynx_rush duration=4 cd=90 )
Define(master_marksman_fire 82926)
@@ -92,20 +95,20 @@ AddIcon mastery=1 help=main
if target.DeadIn() >=21 and not target.DebuffPresent(ranged_vulnerability any=1) Spell(hunters_mark)
Spell(call_pet_1)
}
- unless Stance(1) Spell(aspect_of_the_hawk)
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 Enemies() >5 Spell(cobra_shot)
if target.HealthPercent(less 20) Spell(kill_shot)
+ Spell(kill_command)
+ if SpellUsable(dire_beast) and Focus() <=90 Spell(dire_beast)
if SpellUsable(barrage) Spell(barrage)
if SpellUsable(powershot) Spell(powershot)
if SpellUsable(blink_strike) Spell(blink_strike)
- Spell(kill_command)
- if SpellUsable(dire_beast) and Focus() <=80 Spell(dire_beast)
if BuffPresent(thrill_of_the_hunt) Spell(arcane_shot)
- if Focus() >=69 or BuffPresent(beast_within) Spell(arcane_shot)
if not target.DebuffPresent(focus_fire) and not BuffPresent(beast_within) if BuffStacks(pet_frenzy any=1)>4 Spell(focus_fire)
+ if target.DebuffRemains(serpent_sting_aura) <6 Spell(cobra_shot)
+ if Focus() >=61 or BuffPresent(beast_within) Spell(arcane_shot)
Spell(cobra_shot)
}
AddIcon mastery=1 help=offgcd
@@ -114,15 +117,13 @@ AddIcon mastery=1 help=offgcd
{
Spell(trueshot_aura)
}
+ unless Stance(1) Spell(aspect_of_the_hawk)
+ unless Stance(2) Spell(aspect_of_the_fox)
if Focus() >60 and not BuffPresent(beast_within) Spell(bestial_wrath)
- if SpellUsable(a_murder_of_crows) and not target.DebuffPresent(a_murder_of_crows) Spell(a_murder_of_crows)
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)
}
-AddIcon mastery=1 help=moving
-{
- unless Stance(2) Spell(aspect_of_the_fox)
-}
AddIcon mastery=1 help=aoe
{
Spell(explosive_trap)
@@ -131,8 +132,8 @@ AddIcon mastery=1 help=aoe
AddIcon mastery=1 help=cd
{
Spell(blood_fury)
+ if not BuffPresent(rapid_fire) Spell(rapid_fire)
if SpellUsable(lynx_rush) and not target.DebuffPresent(lynx_rush) Spell(lynx_rush)
- if not BuffPresent(bloodlust) and not BuffPresent(beast_within) Spell(rapid_fire)
if BuffPresent(rapid_fire) Spell(readiness)
}
AddIcon mastery=2 help=main
@@ -142,7 +143,6 @@ AddIcon mastery=2 help=main
if target.DeadIn() >=21 and not target.DebuffPresent(ranged_vulnerability any=1) Spell(hunters_mark)
Spell(call_pet_1)
}
- unless Stance(1) Spell(aspect_of_the_hawk)
if SpellUsable(powershot) Spell(powershot)
if SpellUsable(barrage) Spell(barrage)
if SpellUsable(blink_strike) Spell(blink_strike)
@@ -165,14 +165,12 @@ AddIcon mastery=2 help=offgcd
{
Spell(trueshot_aura)
}
+ unless Stance(1) Spell(aspect_of_the_hawk)
+ unless Stance(2) Spell(aspect_of_the_fox)
if SpellUsable(glaive_toss) Spell(glaive_toss)
Spell(stampede)
if SpellUsable(a_murder_of_crows) and not target.DebuffPresent(a_murder_of_crows) Spell(a_murder_of_crows)
}
-AddIcon mastery=2 help=moving
-{
- unless Stance(2) Spell(aspect_of_the_fox)
-}
AddIcon mastery=2 help=aoe
{
Spell(explosive_trap)
@@ -182,7 +180,7 @@ AddIcon mastery=2 help=cd
{
Spell(blood_fury)
if SpellUsable(lynx_rush) and not target.DebuffPresent(lynx_rush) Spell(lynx_rush)
- if not BuffPresent(bloodlust) or target.DeadIn() <=30 Spell(rapid_fire)
+ if not BuffPresent(rapid_fire) Spell(rapid_fire)
if BuffPresent(rapid_fire) Spell(readiness)
}
AddIcon mastery=3 help=main
@@ -192,18 +190,19 @@ AddIcon mastery=3 help=main
if target.DeadIn() >=21 and not target.DebuffPresent(ranged_vulnerability any=1) Spell(hunters_mark)
Spell(call_pet_1)
}
- unless Stance(1) Spell(aspect_of_the_hawk)
if SpellUsable(blink_strike) Spell(blink_strike)
+ if BuffPresent(lock_and_load) Spell(explosive_shot)
if SpellUsable(powershot) Spell(powershot)
if SpellUsable(barrage) Spell(barrage)
if Enemies() >2 Spell(cobra_shot)
if not target.DebuffPresent(serpent_sting_aura) and target.DeadIn() >=10 Spell(serpent_sting)
- if {target.DebuffRemains(explosive_shot) <2.0 } Spell(explosive_shot)
+ if SpellCooldown(explosive_shot) Spell(explosive_shot)
if target.HealthPercent(less 20) Spell(kill_shot)
if not target.DebuffPresent(black_arrow) and target.DeadIn() >=8 Spell(black_arrow)
if SpellUsable(dire_beast) Spell(dire_beast)
- if Focus() >=67 Spell(arcane_shot)
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)
}
AddIcon mastery=3 help=offgcd
@@ -212,24 +211,23 @@ AddIcon mastery=3 help=offgcd
{
Spell(trueshot_aura)
}
+ unless Stance(1) Spell(aspect_of_the_hawk)
+ unless Stance(2) Spell(aspect_of_the_fox)
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)
Spell(stampede)
}
-AddIcon mastery=3 help=moving
-{
- unless Stance(2) Spell(aspect_of_the_fox)
-}
AddIcon mastery=3 help=aoe
{
Spell(explosive_trap)
Spell(multi_shot)
+ if BuffPresent(thrill_of_the_hunt) Spell(multi_shot)
}
AddIcon mastery=3 help=cd
{
Spell(blood_fury)
if SpellUsable(lynx_rush) and not target.DebuffPresent(lynx_rush) Spell(lynx_rush)
- Spell(rapid_fire)
+ if not BuffPresent(rapid_fire) Spell(rapid_fire)
if BuffPresent(rapid_fire) Spell(readiness)
}
]]
\ No newline at end of file
diff --git a/defaut/Chevalier.lua b/defaut/Chevalier.lua
index f161b50..6ee62d5 100644
--- a/defaut/Chevalier.lua
+++ b/defaut/Chevalier.lua
@@ -1,5 +1,5 @@
Ovale.defaut["DEATHKNIGHT"] = [[Define(army_of_the_dead 42650)
- SpellInfo(army_of_the_dead duration=4 frost=1 blood=1 unholy=1 runicpower=-300 xxx=0 cd=600 )
+ SpellInfo(army_of_the_dead duration=4 frost=1 blood=1 unholy=1 runicpower=-300 cd=600 )
SpellAddBuff(army_of_the_dead army_of_the_dead=1)
Define(blood_fury 20572)
SpellInfo(blood_fury duration=15 cd=120 )
@@ -9,17 +9,17 @@ Define(blood_plague 55078)
SpellAddTargetDebuff(blood_plague blood_plague=1)
Define(blood_tap 45529)
Define(dark_transformation 63560)
- SpellInfo(dark_transformation duration=30 unholy=1 runicpower=-100 xxx=0 )
+ SpellInfo(dark_transformation duration=30 unholy=1 runicpower=-100 )
SpellAddBuff(dark_transformation dark_transformation=1)
Define(death_and_decay 43265)
- SpellInfo(death_and_decay duration=10 unholy=1 runicpower=-100 xxx=0 cd=30 )
+ SpellInfo(death_and_decay duration=10 unholy=1 runicpower=-100 cd=30 )
SpellAddBuff(death_and_decay death_and_decay=1)
Define(death_coil 47541)
SpellInfo(death_coil runicpower=400 )
Define(empower_rune_weapon 47568)
- SpellInfo(empower_rune_weapon runicpower=-250 xxx=0 cd=300 )
+ SpellInfo(empower_rune_weapon runicpower=-250 cd=300 )
Define(festering_strike 85948)
- SpellInfo(festering_strike frost=1 blood=1 runicpower=-200 xxx=0 )
+ SpellInfo(festering_strike frost=1 blood=1 runicpower=-200 )
Define(frost_fever 55095)
SpellInfo(frost_fever duration=30 tick=3 )
SpellAddTargetDebuff(frost_fever frost_fever=1)
@@ -28,34 +28,36 @@ Define(frost_presence 48266)
Define(frost_strike 49143)
SpellInfo(frost_strike runicpower=350 )
Define(horn_of_winter 57330)
- SpellInfo(horn_of_winter duration=300 runicpower=-100 xxx=0 cd=20 )
+ SpellInfo(horn_of_winter duration=300 runicpower=-100 cd=20 )
SpellAddBuff(horn_of_winter horn_of_winter=1)
Define(howling_blast 49184)
- SpellInfo(howling_blast frost=1 runicpower=-100 xxx=0 )
+ SpellInfo(howling_blast frost=1 runicpower=-100 )
Define(icy_touch 45477)
- SpellInfo(icy_touch frost=1 runicpower=-100 xxx=0 )
+ 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 )
SpellAddBuff(mogu_power_potion_aura mogu_power_potion_aura=1)
Define(obliterate 49020)
- SpellInfo(obliterate frost=1 unholy=1 runicpower=-200 xxx=0 )
+ SpellInfo(obliterate frost=1 unholy=1 runicpower=-200 )
Define(outbreak 77575)
SpellInfo(outbreak runicpower=0 cd=60 )
Define(pillar_of_frost 51271)
- SpellInfo(pillar_of_frost duration=20 frost=1 runicpower=-100 xxx=0 cd=60 )
+ SpellInfo(pillar_of_frost duration=20 frost=1 runicpower=-100 cd=60 )
SpellAddBuff(pillar_of_frost pillar_of_frost=1)
Define(plague_leech 123693)
SpellInfo(plague_leech cd=25 )
Define(plague_strike 45462)
- SpellInfo(plague_strike unholy=1 runicpower=-100 xxx=0 )
+ SpellInfo(plague_strike unholy=1 runicpower=-100 )
Define(raise_dead 46584)
SpellInfo(raise_dead cd=120 )
SpellAddBuff(raise_dead raise_dead=1)
Define(rime 59057)
Define(scourge_strike 55090)
- SpellInfo(scourge_strike unholy=1 runicpower=-100 xxx=0 )
-Define(soul_reaper 114867)
+ SpellInfo(scourge_strike unholy=1 runicpower=-100 )
+Define(soul_reaper 114866)
+ SpellInfo(soul_reaper duration=5 blood=1 runicpower=-100 cd=6 )
+ SpellAddBuff(soul_reaper soul_reaper=1)
Define(sudden_doom 49530)
Define(summon_gargoyle 49206)
SpellInfo(summon_gargoyle duration=40 runicpower=600 cd=180 )
@@ -79,6 +81,7 @@ AddIcon mastery=2 help=main
Spell(horn_of_winter)
}
if target.DebuffRemains(frost_fever) <3 or target.DebuffRemains(blood_plague) <3 Spell(outbreak)
+ if target.HealthPercent() <=35 or {{target.HealthPercent() -3 *{target.HealthPercent() /target.DeadIn() } } <=35 } Spell(soul_reaper)
if not target.DebuffPresent(frost_fever) Spell(howling_blast)
if not target.DebuffPresent(blood_plague) Spell(plague_strike)
if TalentPoints(plague_leech_talent) and not {{BuffPresent(killing_machine) and RunicPower() <10 } or {RuneCount(unholy) ==2 or RuneCount(frost) ==2 or RuneCount(death) ==2 } } Spell(plague_leech)
@@ -96,7 +99,6 @@ AddIcon mastery=2 help=main
AddIcon mastery=2 help=offgcd
{
Spell(pillar_of_frost)
- if target.HealthPercent() <=35 or {{target.HealthPercent() -3 *{target.HealthPercent() /target.DeadIn() } } <=35 } Spell(soul_reaper)
if TalentPoints(blood_tap_talent) Spell(blood_tap)
}
AddIcon mastery=2 help=cd
@@ -120,6 +122,7 @@ AddIcon mastery=3 help=main
Spell(horn_of_winter)
}
if target.DebuffRemains(frost_fever) <3 or target.DebuffRemains(blood_plague) <3 Spell(outbreak)
+ if target.HealthPercent() <=35 or {{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 TalentPoints(plague_leech_talent) and {SpellCooldown(outbreak) <1 } Spell(plague_leech)
@@ -135,7 +138,6 @@ AddIcon mastery=3 help=main
}
AddIcon mastery=3 help=offgcd
{
- if target.HealthPercent() <=35 or {{target.HealthPercent() -3 *{target.HealthPercent() /target.DeadIn() } } <=35 } Spell(soul_reaper)
if TalentPoints(blood_tap_talent) Spell(blood_tap)
}
AddIcon mastery=3 help=cd
diff --git a/defaut/Demoniste.lua b/defaut/Demoniste.lua
index d7e19d5..6e1c4e2 100644
--- a/defaut/Demoniste.lua
+++ b/defaut/Demoniste.lua
@@ -35,7 +35,7 @@ Define(fire_and_brimstone 108683)
SpellInfo(fire_and_brimstone burningembers=10 cd=1 )
SpellAddBuff(fire_and_brimstone fire_and_brimstone=1)
Define(grimoire_of_sacrifice 108503)
- SpellInfo(grimoire_of_sacrifice duration=1200 cd=120 )
+ SpellInfo(grimoire_of_sacrifice duration=3600 cd=120 )
SpellAddBuff(grimoire_of_sacrifice grimoire_of_sacrifice=1)
Define(hand_of_guldan 105174)
Define(harvest_life 108371)
@@ -45,7 +45,7 @@ Define(haunt 48181)
SpellInfo(haunt duration=8 shards=1 )
SpellAddBuff(haunt haunt=1)
Define(havoc 80240)
- SpellInfo(havoc duration=15 cd=45 )
+ SpellInfo(havoc duration=15 cd=25 )
SpellAddBuff(havoc havoc=1)
Define(hellfire 1949)
SpellInfo(hellfire duration=14 tick=1 )
@@ -53,7 +53,9 @@ Define(hellfire 1949)
Define(immolate 348)
SpellInfo(immolate duration=15 tick=3 )
SpellAddTargetDebuff(immolate immolate=1)
-Define(immolation_aura 129476)
+Define(immolation_aura 104025)
+ SpellInfo(immolation_aura duration=10 demonicfury=0 stance=1)
+ SpellAddBuff(immolation_aura immolation_aura=1)
Define(incinerate 29722)
Define(life_tap 1454)
SpellInfo(life_tap mana=-15 )
@@ -69,7 +71,9 @@ Define(metamorphosis 103958)
Define(molten_core 122355)
SpellInfo(molten_core duration=30 )
SpellAddBuff(molten_core molten_core=1)
-Define(rain_of_fire 42223)
+Define(rain_of_fire 5740)
+ SpellInfo(rain_of_fire duration=6 )
+ SpellAddBuff(rain_of_fire rain_of_fire=1)
Define(seed_of_corruption 27243)
SpellInfo(seed_of_corruption duration=18 tick=3 )
SpellAddTargetDebuff(seed_of_corruption seed_of_corruption=1)
@@ -133,9 +137,6 @@ AddIcon mastery=1 help=main
if not InFlightToTarget(haunt) and target.DebuffRemains(haunt) <TickTime(haunt) +1 +CastTime(haunt) and SoulShards() Spell(haunt)
if Enemies() >1 and TimeInCombat() <10 and Glyph(56226) Spell(soul_swap)
if not InFlightToTarget(haunt) and target.DebuffRemains(haunt) <TickTime(haunt) +1 +CastTime(haunt) and SoulShards() >1 Spell(haunt)
- if {not target.DebuffPresent(agony) or target.DebuffRemains(agony) <=TickTime(drain_soul) *2 } and target.DeadIn() >=8 Spell(agony)
- if {not target.DebuffPresent(corruption) or target.DebuffRemains(corruption) <TickTime(corruption) } and target.DeadIn() >=6 Spell(corruption)
- if {not target.DebuffPresent(unstable_affliction) or target.DebuffRemains(unstable_affliction) <{CastTime(unstable_affliction) +TickTime(unstable_affliction) } } and target.DeadIn() >=5 Spell(unstable_affliction)
if TicksRemain(agony) <Ticks(agony) /2 and target.DeadIn() >=8 Spell(agony)
if TicksRemain(corruption) <Ticks(corruption) /2 and target.DeadIn() >=6 Spell(corruption)
if TicksRemain(unstable_affliction) <Ticks(unstable_affliction) /2 +1 and target.DeadIn() >=5 Spell(unstable_affliction)
@@ -187,9 +188,9 @@ AddIcon mastery=2 help=main
if target.DebuffExpires(magic_vulnerability any=1) Spell(curse_of_the_elements)
if TalentPoints(grimoire_of_service_talent) Spell(service_felguard)
if TalentPoints(grimoire_of_sacrifice_talent) and BuffExpires(grimoire_of_sacrifice) unless pet.CreatureFamily(Felguard) Spell(summon_felguard)
- if Enemies() >5
+ if Enemies() >3
{
- if {not target.DebuffPresent(corruption) or target.DebuffRemains(corruption) <TickTime(corruption) } and target.DeadIn() >=6 Spell(corruption)
+ if {not target.DebuffPresent(corruption) or target.DebuffRemains(corruption) <TickTime(corruption) } and target.DeadIn() >30 Spell(corruption)
Spell(hand_of_guldan)
if {not target.DebuffPresent(doom) or target.DebuffRemains(doom) <40 } and target.DeadIn() >30 Spell(doom)
if TalentPoints(harvest_life_talent) Spell(harvest_life)
@@ -200,7 +201,7 @@ AddIcon mastery=2 help=main
if target.DebuffRemains(corruption) >20 and BuffExpires(dark_soul) and DemonicFury() <=750 and target.DeadIn() >30 if Stance(1) cancel.Texture(Spell_shadow_demonform)
if not InFlightToTarget(hand_of_guldan) and target.DebuffRemains(shadowflame) <1 +CastTime(shadow_bolt) Spell(hand_of_guldan)
if target.DebuffRemains(corruption) <20 Spell(touch_of_chaos)
- if BuffPresent(molten_core) and {BuffExpires(metamorphosis) or target.HealthPercent() <25 } Spell(soul_fire)
+ if BuffPresent(molten_core) Spell(soul_fire)
Spell(touch_of_chaos)
if ManaPercent() <50 Spell(life_tap)
Spell(shadow_bolt)
@@ -211,7 +212,7 @@ AddIcon mastery=2 help=offgcd
Spell(melee)
Spell(felstorm)
Spell(wrathstorm)
- if Enemies() >5
+ if Enemies() >3
{
if DemonicFury() >=1000 or DemonicFury() >=31 *target.DeadIn() unless Stance(1) Spell(metamorphosis)
}
@@ -256,6 +257,7 @@ AddIcon mastery=3 help=main
if TalentPoints(grimoire_of_sacrifice_talent) and BuffExpires(grimoire_of_sacrifice) unless pet.CreatureFamily(Felhunter) Spell(summon_felhunter)
if Enemies() >2
{
+ if not target.DebuffPresent(rain_of_fire) and not InFlightToTarget(rain_of_fire) Spell(rain_of_fire)
if BuffPresent(fire_and_brimstone) and not target.DebuffPresent(immolate) Spell(immolate)
if BurningEmbers() and BuffPresent(fire_and_brimstone) Spell(conflagrate)
if BuffPresent(fire_and_brimstone) Spell(incinerate)
@@ -273,7 +275,6 @@ AddIcon mastery=3 help=offgcd
{
if Enemies() >2
{
- if not target.DebuffPresent(rain_of_fire) and not InFlightToTarget(rain_of_fire) Spell(rain_of_fire)
if BurningEmbers() and BuffExpires(fire_and_brimstone) Spell(fire_and_brimstone)
}
}
diff --git a/defaut/Druide.lua b/defaut/Druide.lua
index 91f6a72..f12927c 100644
--- a/defaut/Druide.lua
+++ b/defaut/Druide.lua
@@ -16,8 +16,6 @@ Define(dream_of_cenarius_damage 108381)
Define(faerie_fire 770)
SpellInfo(faerie_fire duration=300 )
SpellAddBuff(faerie_fire faerie_fire=1)
-Define(feral_spirit 51533)
- SpellInfo(feral_spirit duration=30 cd=120 )
Define(ferocious_bite 22568)
SpellInfo(ferocious_bite combo=0 energy=25 )
Define(healing_touch 5185)
@@ -63,16 +61,19 @@ Define(skull_bash_cat 80965)
SpellInfo(skull_bash_cat cd=15 )
Define(solar_eclipse 48517)
SpellAddBuff(solar_eclipse solar_eclipse=1)
-Define(starfall 50288)
+Define(starfall 48505)
+ SpellInfo(starfall duration=10 cd=90 )
+ SpellAddBuff(starfall starfall=1)
Define(starfire 2912)
Define(starsurge 78674)
SpellInfo(starsurge cd=15 )
Define(sunfire 93402)
SpellInfo(sunfire duration=14 tick=2 )
SpellAddTargetDebuff(sunfire sunfire=1)
-Define(symbiosis 110309)
- SpellInfo(symbiosis duration=3600 )
- SpellAddBuff(symbiosis symbiosis=1)
+Define(thrash 106832)
+Define(thrash 106830)
+ SpellInfo(thrash duration=15 energy=50 tick=3 )
+ SpellAddTargetDebuff(thrash thrash=1)
Define(tigers_fury 5217)
SpellInfo(tigers_fury duration=6 energy=-60 cd=30 )
SpellAddBuff(tigers_fury tigers_fury=1)
@@ -114,7 +115,6 @@ AddIcon mastery=1 help=main
}
AddIcon mastery=1 help=offgcd
{
- if not BuffPresent(starfall) Spell(starfall)
if BuffStacks(wild_mushroom) >0 and BuffPresent(solar_eclipse) Spell(wild_mushroom_detonate)
if TalentPoints(dream_of_cenarius_talent) and TalentPoints(natures_swiftness_talent) Spell(natures_swiftness)
}
@@ -129,6 +129,7 @@ AddIcon mastery=1 help=moving
}
AddIcon mastery=1 help=cd
{
+ if not BuffPresent(starfall) Spell(starfall)
Spell(berserking)
if TalentPoints(incarnation_talent) and {BuffPresent(lunar_eclipse) or BuffPresent(solar_eclipse) } Spell(incarnation)
if {{EclipseDir() ==0-1 and Eclipse() <=0 } or {EclipseDir() ==1 and Eclipse() >=0 } } and {BuffPresent(chosen_of_elune) or not TalentPoints(incarnation_talent) } Spell(celestial_alignment)
@@ -140,14 +141,14 @@ AddIcon mastery=2 help=main
{
if not BuffPresent(str_agi_int) Spell(mark_of_the_wild)
if not BuffPresent(dream_of_cenarius_damage) and TalentPoints(dream_of_cenarius_talent) Spell(healing_touch)
- shaman.Spell(symbiosis)
unless Stance(3) Spell(cat_form)
Spell(savage_roar)
+ if TalentPoints(force_of_nature_talent) Spell(treants)
}
+ if BuffRemains(savage_roar) <=1 or {BuffRemains(savage_roar) <=3 and ComboPoints() >0 and {BuffExpires(dream_of_cenarius_damage) or ComboPoints() <5 } } Spell(savage_roar)
if target.IsInterruptible() Spell(skull_bash_cat)
if BuffPresent(predatory_swiftness) and BuffRemains(predatory_swiftness) <=1 and TalentPoints(dream_of_cenarius_talent) and {BuffExpires(dream_of_cenarius_damage) or {BuffStacks(dream_of_cenarius_damage) ==1 and not BuffPresent(omen_of_clarity) } } Spell(healing_touch)
if PreviousSpell(natures_swiftness) Spell(healing_touch)
- if BuffRemains(savage_roar) <=1 or {BuffRemains(savage_roar) <=3 and ComboPoints() >0 and {BuffExpires(dream_of_cenarius_damage) or ComboPoints() <5 } } Spell(savage_roar)
if target.DebuffStacks(weakened_armor) <3 Spell(faerie_fire)
if BuffPresent(predatory_swiftness) and TalentPoints(dream_of_cenarius_talent) and BuffExpires(dream_of_cenarius_damage) and {{{ComboPoints() >=5 and target.DebuffRemains(rip) >SpellCooldown(healing_touch) and target.HealthPercent() <=25 } } } Spell(healing_touch)
if ComboPoints() >=5 and target.DebuffPresent(rip) and target.HealthPercent() <=25 Spell(ferocious_bite)
@@ -158,7 +159,6 @@ AddIcon mastery=2 help=main
if ComboPoints() >=5 and target.DeadIn() >=6 and target.DebuffRemains(rip) <2.0 and {BuffPresent(berserk) or target.DebuffRemains(rip) <=SpellCooldown(tigers_fury) } Spell(rip)
if BuffPresent(predatory_swiftness) and TalentPoints(dream_of_cenarius_talent) and BuffExpires(dream_of_cenarius_damage) and {{{ComboPoints() >=5 and target.DebuffRemains(rip) >{5 +SpellCooldown(healing_touch) } and BuffRemains(savage_roar) >={1 +SpellCooldown(healing_touch) } and BuffRemains(berserk) >SpellCooldown(healing_touch) } } } Spell(healing_touch)
if ComboPoints() >=5 and target.DebuffRemains(rip) >5.0 and BuffRemains(savage_roar) >=1.0 and BuffPresent(berserk) Spell(ferocious_bite)
- if ComboPoints() >=5 and target.DeadIn() >=8.5 and target.DebuffRemains(rip) <=12 and BuffRemains(savage_roar) <={target.DebuffRemains(rip) +4 } Spell(savage_roar)
if BuffPresent(predatory_swiftness) and TalentPoints(dream_of_cenarius_talent) and BuffExpires(dream_of_cenarius_damage) and {target.HealthPercent() <=25 or target.DebuffRemains(rip) >4 } and {{{target.DeadIn() >={8.5 +SpellCooldown(healing_touch) } and {BuffRemains(tigers_fury) >=SpellCooldown(healing_touch) or {SpellCooldown(tigers_fury) >21 and target.DebuffRemains(rake) <{12.0 +SpellCooldown(healing_touch) } } } } } } Spell(healing_touch)
if BuffPresent(predatory_swiftness) and TalentPoints(dream_of_cenarius_talent) and BuffExpires(dream_of_cenarius_damage) and {target.HealthPercent() <=25 or target.DebuffRemains(rip) >4 } and {{{target.DeadIn() >={8.5 +SpellCooldown(healing_touch) } and target.DebuffRemains(rake) <{3.0 +SpellCooldown(healing_touch) } and {BuffRemains(berserk) >SpellCooldown(healing_touch) or {SpellCooldown(tigers_fury) +0.8 } >=target.DebuffRemains(rake) } } } } Spell(healing_touch)
if target.DeadIn() >=8.5 and BuffPresent(dream_of_cenarius_damage) and {LastSpellDamageMultiplier(rake) <=DamageMultiplier(rake) } and not PreviousSpell(rake) Spell(rake)
@@ -179,6 +179,7 @@ AddIcon mastery=2 help=main
if SpellCooldown(tigers_fury) <=3.0 Spell(shred)
if target.DeadIn() <=8.5 Spell(shred)
if TimeToMaxEnergy() <=1.0 Spell(shred)
+ if TalentPoints(force_of_nature_talent) Spell(treants)
}
AddIcon mastery=2 help=offgcd
{
@@ -187,6 +188,7 @@ AddIcon mastery=2 help=offgcd
if not BuffPresent(predatory_swiftness) and TalentPoints(dream_of_cenarius_talent) and BuffExpires(dream_of_cenarius_damage) and TalentPoints(natures_swiftness_talent) and target.HealthPercent() >25 and {{{ComboPoints() >=5 and target.DeadIn() >={6 +SpellCooldown(healing_touch) } and target.DebuffRemains(rip) <{2 +SpellCooldown(healing_touch) } and {BuffPresent(berserk) or target.DebuffRemains(rip) <=SpellCooldown(tigers_fury) } } } } Spell(natures_swiftness)
if not BuffPresent(predatory_swiftness) and TalentPoints(dream_of_cenarius_talent) and BuffExpires(dream_of_cenarius_damage) and {target.HealthPercent() <=25 or {target.DebuffRemains(rip) >4 and ArmorSetParts(T14 more 4) } } and {{{target.DeadIn() >={8.5 +SpellCooldown(healing_touch) } and BuffPresent(tigers_fury) } } } Spell(natures_swiftness)
if not BuffPresent(predatory_swiftness) and TalentPoints(dream_of_cenarius_talent) and BuffExpires(dream_of_cenarius_damage) and {target.HealthPercent() <=25 or {target.DebuffRemains(rip) >4 and ArmorSetParts(T14 more 4) } } and {{{target.DeadIn() >={8.5 +SpellCooldown(healing_touch) } and target.DebuffRemains(rake) <{3.0 +SpellCooldown(healing_touch) } and {BuffRemains(berserk) >SpellCooldown(healing_touch) or {SpellCooldown(tigers_fury) +0.8 } >=target.DebuffRemains(rake) } } } } Spell(natures_swiftness)
+ if BuffPresent(omen_of_clarity) and target.DebuffRemains(thrash) <3 Spell(thrash)
}
AddIcon mastery=2 help=cd
{
@@ -195,6 +197,5 @@ AddIcon mastery=2 help=cd
if BuffPresent(berserk) and TalentPoints(natures_vigil_talent) Spell(natures_vigil)
if BuffPresent(berserk) and TalentPoints(incarnation_talent) Spell(incarnation)
Spell(berserking)
- Spell(feral_spirit)
}
]]
\ No newline at end of file
diff --git a/defaut/Mage.lua b/defaut/Mage.lua
index cdc8870..46bb4d2 100644
--- a/defaut/Mage.lua
+++ b/defaut/Mage.lua
@@ -12,7 +12,8 @@ Define(arcane_brilliance 1459)
Define(arcane_charge 36032)
SpellInfo(arcane_charge duration=10 )
SpellAddBuff(arcane_charge arcane_charge=1)
-Define(arcane_missiles 7268)
+Define(arcane_missiles 5143)
+ SpellInfo(arcane_missiles duration=2 )
Define(arcane_missiles_aura 79683)
SpellInfo(arcane_missiles_aura duration=20 )
SpellAddBuff(arcane_missiles_aura arcane_missiles_aura=1)
@@ -107,9 +108,11 @@ AddIcon mastery=1 help=main
}
if ItemCharges(36799) <3 and False() Spell(conjure_mana_gem)
if BuffPresent(alter_time) and BuffPresent(presence_of_mind) Spell(arcane_blast)
+ if BuffPresent(alter_time) or BuffStacks(arcane_missiles_aura) ==2 Spell(arcane_missiles)
if BuffExpires(rune_of_power) and BuffExpires(alter_time) Spell(rune_of_power)
if not target.DebuffPresent(nether_tempest) Spell(nether_tempest)
if ManaPercent() >92 Spell(arcane_blast)
+ if BuffPresent(arcane_missiles_aura) and {SpellCooldown(alter_time_activate) >4 or target.DeadIn() <10 } Spell(arcane_missiles)
if BuffPresent(arcane_charge) and BuffExpires(arcane_power) and BuffExpires(alter_time) and target.DeadIn() >25 and {SpellCooldown(mana_gem) >10 or ItemCharges(36799) ==0 } Spell(arcane_barrage)
if BuffStacks(arcane_charge) >=4 and BuffExpires(arcane_missiles_aura) and target.DeadIn() >25 Spell(arcane_barrage)
Spell(arcane_blast)
@@ -119,9 +122,7 @@ AddIcon mastery=1 help=offgcd
if target.IsInterruptible() if target.IsInterruptible() Spell(counterspell)
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 BuffPresent(alter_time) or BuffStacks(arcane_missiles_aura) ==2 Spell(arcane_missiles)
if ManaPercent() <84 and BuffExpires(alter_time) Spell(mana_gem)
- if BuffPresent(arcane_missiles_aura) and {SpellCooldown(alter_time_activate) >4 or target.DeadIn() <10 } Spell(arcane_missiles)
}
AddIcon mastery=1 help=moving
{
diff --git a/defaut/Moine.lua b/defaut/Moine.lua
index 412aced..f960b66 100644
--- a/defaut/Moine.lua
+++ b/defaut/Moine.lua
@@ -16,7 +16,8 @@ Define(combo_breaker_tp 118864)
Define(energizing_brew 115288)
SpellInfo(energizing_brew duration=6 cd=60 )
SpellAddBuff(energizing_brew energizing_brew=1)
-Define(fists_of_fury 117418)
+Define(fists_of_fury 113656)
+ SpellInfo(fists_of_fury duration=4 chi=3 cd=25 )
SpellAddBuff(fists_of_fury fists_of_fury=1)
Define(invoke_xuen 123904)
SpellInfo(invoke_xuen duration=45 cd=180 )
@@ -28,7 +29,9 @@ Define(rising_sun_kick 107428)
Define(rushing_jade_wind 116847)
SpellInfo(rushing_jade_wind duration=8 chi=2 cd=30 )
SpellAddBuff(rushing_jade_wind rushing_jade_wind=1)
-Define(spinning_crane_kick 117640)
+Define(spinning_crane_kick 101546)
+ SpellInfo(spinning_crane_kick duration=2.25 energy=40 )
+ SpellAddBuff(spinning_crane_kick spinning_crane_kick=1)
Define(tiger_palm 100787)
SpellInfo(tiger_palm chi=1 )
Define(tiger_power 125359)
@@ -54,11 +57,13 @@ AddIcon mastery=3 help=main
{
if TalentPoints(rushing_jade_wind_talent) Spell(rushing_jade_wind)
if Chi() ==4 Spell(chi_burst)
+ Spell(spinning_crane_kick)
}
{
if BuffStacks(tiger_power) <3 or BuffRemains(tiger_power) <=3 or {BuffRemains(tiger_power) <=6 and SpellCooldown(fists_of_fury) <=1 } Spell(tiger_palm)
Spell(rising_sun_kick)
+ if not BuffPresent(energizing_brew) and Energy() <=65 and BuffRemains(tiger_power) >=6.5 Spell(fists_of_fury)
if BuffPresent(combo_breaker_bok) Spell(blackout_kick)
if BuffPresent(combo_breaker_tp) and {Energy() <=90 or {BuffPresent(energizing_brew) and Energy() <=80 } or {BuffPresent(combo_breaker_tp) and BuffRemains(combo_breaker_tp) <=3 } } Spell(tiger_palm)
if {Chi() <=2 and SpellCooldown(power_strikes) } or {Chi() <=1 and not SpellCooldown(power_strikes) } Spell(jab)
@@ -73,7 +78,6 @@ AddIcon mastery=3 help=offgcd
if not BuffPresent(tigereye_brew_use) and BuffPresent(tigereye_brew) ==10 Spell(tigereye_brew_use)
if not BuffPresent(tigereye_brew_use) and {BuffPresent(tigereye_brew) >=7 and {SpellCooldown(energizing_brew) <=2 or BuffPresent(energizing_brew) } } Spell(tigereye_brew_use)
if Energy() <=35 Spell(energizing_brew)
- Spell(spinning_crane_kick)
}
{
@@ -81,7 +85,6 @@ AddIcon mastery=3 help=offgcd
if not BuffPresent(tigereye_brew_use) and {BuffPresent(tigereye_brew) >=7 and {SpellCooldown(energizing_brew) <=2 or BuffPresent(energizing_brew) } } Spell(tigereye_brew_use)
if not BuffPresent(tigereye_brew_use) and SpellCooldown(energizing_brew) >=45 and SpellCooldown(energizing_brew) <=48 Spell(tigereye_brew_use)
if Energy() <=35 Spell(energizing_brew)
- if not BuffPresent(energizing_brew) and Energy() <=65 and BuffRemains(tiger_power) >=6.5 Spell(fists_of_fury)
}
}
AddIcon mastery=3 help=cd
diff --git a/defaut/Paladin.lua b/defaut/Paladin.lua
index 12a6103..989fdf9 100644
--- a/defaut/Paladin.lua
+++ b/defaut/Paladin.lua
@@ -9,6 +9,9 @@ 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(darkmist_vortex 126657)
+ SpellInfo(darkmist_vortex duration=20 )
+ SpellAddBuff(darkmist_vortex darkmist_vortex=1)
Define(execution_sentence 114916)
SpellInfo(execution_sentence duration=10 tick=1 )
SpellAddTargetDebuff(execution_sentence execution_sentence=1)
@@ -24,6 +27,9 @@ Define(inquisition 84963)
SpellAddBuff(inquisition inquisition=1)
Define(judgment 20271)
SpellInfo(judgment cd=6 )
+Define(lei_shins_final_orders 126582)
+ SpellInfo(lei_shins_final_orders duration=20 )
+ SpellAddBuff(lei_shins_final_orders lei_shins_final_orders=1)
Define(rebuke 96231)
SpellInfo(rebuke duration=4 cd=15 )
Define(seal_of_insight 20165)
@@ -41,7 +47,7 @@ AddIcon mastery=3 help=main
unless Stance(1) Spell(seal_of_truth)
}
if ManaPercent() >=90 or Stance(0) unless Stance(1) Spell(seal_of_truth)
- if ManaPercent() <=20 unless Stance(4) Spell(seal_of_insight)
+ if ManaPercent() <=30 unless Stance(4) Spell(seal_of_insight)
if {BuffExpires(inquisition) or BuffRemains(inquisition) <=2 } and {HolyPower() >=3 } Spell(inquisition)
if HolyPower() ==5 Spell(templars_verdict)
Spell(hammer_of_wrath usable=1)
@@ -58,8 +64,8 @@ AddIcon mastery=3 help=offgcd
}
AddIcon mastery=3 help=cd
{
+ if BuffPresent(inquisition) and {BuffPresent(darkmist_vortex) or BuffPresent(lei_shins_final_orders) } Spell(avenging_wrath)
if BuffPresent(inquisition) and BuffPresent(avenging_wrath) Spell(guardian_of_ancient_kings)
- if BuffPresent(inquisition) Spell(avenging_wrath)
if BuffPresent(inquisition) { Item(Trinket0Slot usable=1) Item(Trinket1Slot usable=1) }
}
]]
\ No newline at end of file
diff --git a/defaut/Pretre.lua b/defaut/Pretre.lua
index 528e83d..6827c82 100644
--- a/defaut/Pretre.lua
+++ b/defaut/Pretre.lua
@@ -21,8 +21,8 @@ Define(mind_blast 8092)
Define(mind_flay 15407)
SpellInfo(mind_flay duration=3 canStopChannelling=1 )
SpellAddTargetDebuff(mind_flay mind_flay=1)
-Define(mind_sear 49821)
- SpellInfo(mind_sear canStopChannelling=1 )
+Define(mind_sear 48045)
+ SpellInfo(mind_sear duration=5 canStopChannelling=1 )
SpellAddBuff(mind_sear mind_sear=1)
Define(mind_spike 73510)
Define(power_word_fortitude 21562)
@@ -53,13 +53,14 @@ AddIcon mastery=3 help=main
Spell(shadowform)
}
Spell(shadowform)
- if ShadowOrbs() ==3 Spell(devouring_plague)
+ if ShadowOrbs() ==3 and {SpellCooldown(mind_blast) <2 or target.HealthPercent() <20 } Spell(devouring_plague)
if SpellCooldown(mind_blast) Spell(mind_blast)
- if BuffPresent(surge_of_darkness) Spell(mind_spike)
if {not target.DebuffPresent(shadow_word_pain) or target.DebuffRemains(shadow_word_pain) <TickTime(shadow_word_pain) } Spell(shadow_word_pain)
if target.HealthPercent(less 20) Spell(shadow_word_death)
if {not target.DebuffPresent(vampiric_touch) or target.DebuffRemains(vampiric_touch) <CastTime(vampiric_touch) +TickTime(vampiric_touch) } Spell(vampiric_touch)
+ if ShadowOrbs() ==3 Spell(devouring_plague)
Spell(halo_damage)
+ if BuffPresent(surge_of_darkness) Spell(mind_spike)
Spell(mind_flay)
}
AddIcon mastery=3 help=moving
diff --git a/defaut/Voleur.lua b/defaut/Voleur.lua
index ff119e4..c45b61b 100644
--- a/defaut/Voleur.lua
+++ b/defaut/Voleur.lua
@@ -6,6 +6,7 @@ Define(ambush 8676)
Define(anticipation 114015)
Define(backstab 53)
SpellInfo(backstab energy=35 combo=1 )
+Define(bandits_guile 84654)
Define(berserking 26297)
SpellInfo(berserking duration=10 cd=180 )
SpellAddBuff(berserking berserking=1)
@@ -34,7 +35,7 @@ Define(master_of_subtlety 31223)
Define(mutilate 1329)
SpellInfo(mutilate energy=55 combo=2 )
Define(premeditation 14183)
- SpellInfo(premeditation duration=20 combo=2 cd=20 )
+ SpellInfo(premeditation duration=18 combo=2 cd=20 )
Define(preparation 14185)
SpellInfo(preparation cd=300 )
Define(revealing_strike 84617)
@@ -75,11 +76,11 @@ AddIcon mastery=1 help=main
if WeaponEnchantExpires(mainhand 300) Item(6497)
}
Spell(ambush usable=1)
- if BuffExpires(slice_and_dice) Spell(slice_and_dice)
+ if BuffRemains(slice_and_dice) <2 Spell(slice_and_dice)
if target.TicksRemain(rupture) <2 and Energy() >90 Spell(dispatch usable=1)
if target.TicksRemain(rupture) <2 and Energy() >90 Spell(mutilate)
if TicksRemain(rupture) <2 or {ComboPoints() ==5 and TicksRemain(rupture) <3 } Spell(rupture)
- if ComboPoints() >=4 and TicksRemain(envenom) <2 Spell(envenom)
+ if ComboPoints() >=4 and BuffRemains(envenom) <1 Spell(envenom)
if ComboPoints() >4 Spell(envenom)
if ComboPoints() >=2 and BuffRemains(slice_and_dice) <3 Spell(envenom)
if ComboPoints() <5 Spell(dispatch usable=1)
@@ -110,12 +111,12 @@ AddIcon mastery=2 help=main
if WeaponEnchantExpires(mainhand 300) Item(6497)
}
Spell(ambush usable=1)
- if BuffRemains(slice_and_dice) <2 Spell(slice_and_dice)
+ if BuffRemains(slice_and_dice) <2 or {BuffRemains(slice_and_dice) <15 and BuffStacks(bandits_guile) ==11 and ComboPoints() >=4 } Spell(slice_and_dice)
if TicksRemain(rupture) <2 and ComboPoints() ==5 and BuffPresent(deep_insight) and target.DeadIn() >10 Spell(rupture)
- if ComboPoints() ==5 and BuffPresent(deep_insight) Spell(eviscerate)
- if BuffStacks(anticipation) ==5 Spell(eviscerate)
- if BuffStacks(anticipation) <5 and TicksRemain(revealing_strike) <2 Spell(revealing_strike)
- if {not BuffPresent(shadow_blades) and BuffStacks(anticipation) <4 } or BuffStacks(anticipation) <5 Spell(sinister_strike)
+ if {ComboPoints() ==5 and BuffPresent(deep_insight) } or BuffStacks(anticipation) >=4 Spell(eviscerate)
+ if TicksRemain(rupture) <2 and ComboPoints() ==5 and target.DeadIn() >10 Spell(rupture)
+ if {{BuffExpires(deep_insight) and BuffStacks(anticipation) <5 } or {BuffPresent(deep_insight) and ComboPoints() <5 } } and TicksRemain(revealing_strike) <2 Spell(revealing_strike)
+ if {BuffExpires(deep_insight) and BuffStacks(anticipation) <5 } or {BuffPresent(deep_insight) and ComboPoints() <5 } Spell(sinister_strike)
}
AddIcon mastery=2 help=offgcd
{
@@ -131,10 +132,10 @@ AddIcon mastery=2 help=cd
if TalentPoints(preparation_talent) and 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)
+ if TimeInCombat() >10 and not BuffPresent(shadow_blades) and not BuffPresent(adrenaline_rush) and Energy() <20 and {{BuffPresent(deep_insight) and ComboPoints() <4 } or BuffStacks(anticipation) <4 } Spell(vanish)
if {BuffPresent(bloodlust) or TimeInCombat() >60 } and BuffRemains(slice_and_dice) >=12000 Spell(shadow_blades)
if Energy() <35 and BuffRemains(slice_and_dice) >4 and BuffExpires(adrenaline_rush) Spell(killing_spree)
- if Energy() <35 Spell(adrenaline_rush)
+ if Energy() <35 or BuffPresent(shadow_blades) Spell(adrenaline_rush)
}
AddIcon mastery=3 help=main
{