diff --git a/Ovale.toc b/Ovale.toc
index bddaf45..30ca7ba 100644
--- a/Ovale.toc
+++ b/Ovale.toc
@@ -3,7 +3,7 @@
## Notes: Show the icon of the next spell to cast
## Notes-frFR: Affiche l'icône du prochain sort à lancer
## Author: Sidoine
-## Version: 4.1.0
+## Version: 4.1.1
## OptionalDeps: Ace3, ButtonFacade, Recount, Skada, LibBabble-CreatureType-3.0, LibRangeCheck-2.0
## SavedVariables: OvaleDB
## SavedVariablesPerCharacter: OvaleDBPC
diff --git a/defaut/Chaman.lua b/defaut/Chaman.lua
index f85985c..1581e5c 100644
--- a/defaut/Chaman.lua
+++ b/defaut/Chaman.lua
@@ -109,8 +109,16 @@ AddIcon help=main mastery=1
#/flame_shock,if=!ticking|ticks_remain<3
if TargetDebuffExpires(FLAMESHOCK 3 mine=1) Spell(FLAMESHOCK)
+
+ if CheckBoxOn(aoe)
+ {
+ Spell(EARTHQUAKE)
+ if TargetDebuffPresent(FLAMESHOCK mine=1) Spell(FIRENOVA)
+ }
+
#/lava_burst,if=(dot.flame_shock.remains-cast_time)>=0.05
if target.debuffExpires(FLAMESHOCK mine=1) - castTime(LAVABURST) > 0.05 Spell(LAVABURST)
+
#/earth_shock,if=buff.lightning_shield.stack=9
if BuffPresent(LIGHTNINGSHIELD stacks=9) Spell(EARTHSHOCK)
#/earth_shock,if=buff.lightning_shield.stack>6&dot.flame_shock.remains>cooldown&dot.flame_shock.remains<cooldown+action.flame_shock.tick_time
@@ -149,7 +157,6 @@ AddIcon help=main mastery=2
if TargetDebuffExpires(FLAMESHOCK 0 mine=1) Spell(FLAMESHOCK)
Spell(EARTHSHOCK)
Spell(STORMSTRIKE)
- Spell(FIRENOVA)
if BuffPresent(MAELSTROMWEAPON stacks=2) Spell(CHAINLIGHTNING)
Spell(LAVABURST)
}
@@ -172,8 +179,7 @@ AddIcon help=main mastery=2
#/stormstrike
Spell(STORMSTRIKE)
#/fire_nova
- if TotemPresent(fire totem=MAGMATOTEM) or TotemPresent(fire totem=FIREELEMENTALTOTEM) or TotemPresent(fire totem=FLAMETHONGTOTEM)
- Spell(FIRENOVA)
+ if TargetDebuffPresent(FLAMESHOCK mine=1) Spell(FIRENOVA)
#/lightning_bolt,if=buff.maelstrom_weapon.stack=4&buff.maelstrom_weapon.react
if BuffPresent(MAELSTROMWEAPON stacks=4) Spell(LIGHTNINGBOLT)
}
diff --git a/defaut/Chevalier.lua b/defaut/Chevalier.lua
index 09780d3..d60b7a4 100644
--- a/defaut/Chevalier.lua
+++ b/defaut/Chevalier.lua
@@ -102,6 +102,7 @@ Define(KILLINGMACHINE 51124)
Define(SHADOWINFUSION 91342)
Define(SUDDENDOOM 81340)
Define(RUNICCORRUPTION 51459)
+Define(UNHOLYSTRENGTHBUFF 53365)
AddCheckBox(horn SpellName(HORNOFWINTER))
AddCheckBox(scarlet SpellName(SCARLETFEVER) mastery=1 default)
@@ -185,26 +186,35 @@ AddIcon help=main mastery=2
if Runes(unholy 2 frost 2 nodeath=1) or Runes(death 2) Spell(OBLITERATE)
#/obliterate,if=buff.killing_machine.react
if BuffPresent(KILLINGMACHINE) and Runes(unholy 1 frost 1) Spell(OBLITERATE)
- #/blood_tap
- unless Runes(frost 1 unholy 1) Spell(BLOODTAP priority=2)
- #/blood_strike,if=blood=2
- if Runes(blood 2) Spell(BLOODSTRIKE)
- #/frost_strike,if=runic_power>=90
- if Mana(more 89) Spell(FROSTSTRIKE)
- #/howling_blast,if=buff.rime.react
+ #/frost_strike,if=runic_power>=90&!buff.bloodlust.react
+ if Mana(more 89) and BuffExpires(heroism) Spell(FROSTSTRIKE)
+ #/frost_strike,if=runic_power>=95
+ if Mana(more 94) Spell(FORSTSTRIKE)
+ #/howling_blast,if=buff.rime.react
if BuffPresent(FREEZINGFOG) Spell(HOWLINGBLAST)
- #/obliterate
+ #/howling_blast,if=(death+unholy)=0&!buff.bloodlust.react
+ unless Runes(unholy 1 nodeath=1) or Runes(death 1) or BuffPresent(heroism)
+ if Runes(frost 1) Spell(HOWLINGBLAST)
+ #/obliterate
if Runes(unholy 1 frost 1) Spell(OBLITERATE)
- #/blood_strike
- if Runes(blood 1) Spell(BLOODSTRIKE)
- #/frost_strike
+ #/empower_rune_weapon,if=target.time_to_die<=45
+ if TargetDeadIn(less 45) Spell(EMPOWERRUNEWEAPON priority=2)
+ #/frost_strike
Spell(FROSTSTRIKE usable=1)
- #/empower_rune_weapon
- Spell(EMPOWERRUNEWEAPON priority=2)
+ #/howling_blast
+ if Runes(frost 1) Spell(HOWLINGBLAST)
#/horn_of_winter
if CheckBoxOn(horn) Spell(HORNOFWINTER priority=2)
}
+AddIcon help=offgcd mastery=2
+{
+ #/blood_tap
+ Spell(BLOODTAP)
+ #/empower_rune_weapon
+ Spell(EMPOWERRUNEWEAPON)
+}
+
AddIcon help=aoe mastery=2
{
if Runes(unholy 1 frost 1) Spell(HOWLINGBLAST)
@@ -224,8 +234,13 @@ AddIcon help=cd mastery=2
{
#/pillar_of_frost
if Runes(frost 1) Spell(PILLAROFFROST)
+ #/blood_tap,if=death!=2
+ unless Runes(death 2) Spell(BLOODTAP)
+ #/raise_dead,if=buff.rune_of_the_fallen_crusader.react
#/raise_dead,time>=15
- unless TotemPresent(ghoul) if TimeInCombat(more 15) Spell(RAISEDEAD priority=2)
+ unless TotemPresent(ghoul) if TimeInCombat(more 15) or BuffPresent(UNHOLYSTRENGTHBUFF) Spell(RAISEDEAD priority=2)
+ #/empower_rune_weapon,if=target.time_to_die<=120&buff.killing_machine.react
+ if TargetDeadIn(less 120) and BuffPresent(KILLINGMACHINE) Spell(EMPOWERRUNEWEAPON)
Item(Trinket0Slot usable=1)
Item(Trinket1Slot usable=1)
}
@@ -265,12 +280,16 @@ AddIcon help=main mastery=3
if Runes(blood 1 frost 1 nodeath=1) Spell(FESTERINGSTRIKE)
#/death_coil
if Mana(more 54) Spell(DEATHCOIL usable=1)
+ #/horn_of_winter
+ Spell(HORNOFWINTER)
+}
+
+AddIcon help=offgcd mastery=3
+{
#/blood_tap,if=unholy=0&inactive_death=1
unless Runes(unholy 1) Spell(BLOODTAP priority=2)
#/empower_rune_weapon,if=unholy=0
unless Runes(unholy 1) Spell(EMPOWERRUNEWEAPON priority=2)
- #/horn_of_winter
- Spell(HORNOFWINTER)
}
AddIcon help=aoe mastery=3
diff --git a/defaut/Demoniste.lua b/defaut/Demoniste.lua
index 3858fc6..c7e6cc6 100644
--- a/defaut/Demoniste.lua
+++ b/defaut/Demoniste.lua
@@ -187,7 +187,7 @@ AddIcon help=cd mastery=1
{
#/summon_infernal
Spell(DEMONSOUL)
- Spell(SUMMONINFERNAL)
+ Spell(SUMMONDOOMGUARD)
Item(Trinket0Slot usable=1)
Item(Trinket1Slot usable=1)
}
@@ -241,7 +241,7 @@ AddIcon help=cd mastery=2
{
Spell(METAMORPHOSIS)
Spell(DEMONSOUL)
- if BuffPresent(METAMORPHOSIS) Spell(SUMMONINFERNAL)
+ if BuffPresent(METAMORPHOSIS) Spell(SUMMONDOOMGUARD)
Item(Trinket0Slot usable=1)
Item(Trinket1Slot usable=1)
}
@@ -289,7 +289,7 @@ AddIcon help=main mastery=3
AddIcon help=cd mastery=3
{
Spell(DEMONSOUL)
- if BuffPresent(heroism) Spell(SUMMONFELGUARD)
+ if BuffPresent(heroism) Spell(SUMMONDOOMGUARD)
Item(Trinket0Slot usable=1)
Item(Trinket1Slot usable=1)
}
@@ -303,14 +303,20 @@ AddIcon size=small mastery=1
{
unless PetPresent()
{
- if List(afflic shadow) Spell(SUMMONSUCCUBUS)
- if List(afflic drain) Spell(SUMMONIMP)
+ if Glyph(GLYPHOFLASHOFPAIN) Spell(SUMMONSUCCUBUS)
+ if Glyph(GLYPHOFIMP) Spell(SUMMONIMP)
+ Spell(SUMMONFELHUNTER)
}
}
AddIcon size=small mastery=2
{
- unless PetPresent() Spell(SUMMONFELGUARD)
+ unless PetPresent()
+ {
+ if Glyph(GLYPHOFLASHOFPAIN) Spell(SUMMONSUCCUBUS)
+ if Glyph(GLYPHOFIMP) Spell(SUMMONIMP)
+ Spell(SUMMONFELGUARD)
+ }
}
AddIcon size=small mastery=3
diff --git a/defaut/Druide.lua b/defaut/Druide.lua
index 8803304..56273d7 100644
--- a/defaut/Druide.lua
+++ b/defaut/Druide.lua
@@ -147,11 +147,14 @@ AddIcon help=main mastery=1
if TargetDeadIn(more 6) and BuffExpires(ASTRALALIGNMENT)
{
- #/sunfire,if=(!ticking|ticks_remain<2)&buff.t11_4pc_caster.down&!dot.moonfire.remains>0
- if BuffPresent(ECLIPSESOLAR) and TargetDebuffExpires(MOONFIRE 0 mine=1) and TargetDebuffExpires(SUNFIRE 2 mine=1)
+ #/sunfire,if=(!ticking|ticks_remain<2|(dot.sunfire.remains<4&buff.solar_eclipse.up&eclipse<15))&!dot.moonfire.remains>0";
+ if BuffPresent(ECLIPSESOLAR) and {TargetDebuffExpires(SUNFIRE 2 mine=1) or {TargetDebuffExpires(SUNFIRE 4 mine=1) and Eclipse(less 15)}}
+ and TargetDebuffExpires(MOONFIRE 0 mine=1)
Spell(SUNFIRE nored=1)
- #/moonfire,if=!ticking&buff.t11_4pc_caster.down&!dot.sunfire.remains>0
- if TargetDebuffExpires(MOONFIRE 2 mine=1) and TargetDebuffExpires(SUNFIRE 0 mine=1) and BuffExpires(ECLIPSESOLAR)
+
+ #/moonfire,if=(!ticking|ticks_remain<2|(dot.moonfire.remains<4&buff.lunar_eclipse.up&eclipse>-20))
+ if BuffExpires(ECLIPSELUNAR 0) and {TargetDebuffExpires(MOONFIRE 2 mine=1) or {TargetDebuffExpires(MOONFIRE 4 mine=1) and Eclipse(more -20)}}
+ and TargetDebuffExpires(SUNFIRE 0 mine=1)
Spell(MOONFIRE nored=1)
}
diff --git a/defaut/Guerrier.lua b/defaut/Guerrier.lua
index d5ed053..1987077 100644
--- a/defaut/Guerrier.lua
+++ b/defaut/Guerrier.lua
@@ -177,8 +177,8 @@ AddIcon help=main mastery=1
Spell(OVERPOWER usable=1)
#/execute
if TargetLifePercent(less 20) Spell(EXECUTE)
- #/slam,if=(cooldown.mortal_strike.remains>=1.5&(rage>=35|swing.mh.remains<1.1|buff.deadly_calm.up|buff.colossus_smash.up))|(cooldown.mortal_strike.remains>=1.2&buff.colossus_smash.remains>0.5&rage>=35)
- if {{spell(MORTALSTRIKE)>1.5} and {Mana(more 34) or NextSwing(main 1.1) or BuffPresent(DEADLYCALM) or BuffPresent(COLOSSUSSMASH)}} or {spell(MORTALSTRIKE)>1.2 and BuffPresent(COLOSSUSSMASH 0.5) and Mana(more 34)}
+ #/slam,if=(cooldown.mortal_strike.remains>=1.5&(rage>=35|buff.deadly_calm.up|buff.colossus_smash.up))|(cooldown.mortal_strike.remains>=1.2&buff.colossus_smash.remains>0.5&rage>=35)
+ if {{spell(MORTALSTRIKE)>1.5} and {Mana(more 34) or BuffPresent(DEADLYCALM) or BuffPresent(COLOSSUSSMASH)}} or {spell(MORTALSTRIKE)>1.2 and BuffPresent(COLOSSUSSMASH 0.5) and Mana(more 34)}
Spell(SLAM)
#/battle_shout,if=rage<20
if Mana(less 20) Spell(BATTLESHOUT priority=2)
@@ -188,8 +188,8 @@ AddIcon help=offgcd mastery=1
{
if target.IsInterruptible() Spell(PUMMEL)
if CheckBoxOn(multi) Spell(CLEAVE)
- #/heroic_strike,if=(rage>70|buff.deadly_calm.up|buff.incite.up|buff.battle_trance.up)
- if Mana(more 70) or BuffPresent(DEADLYCALM) or BuffPresent(INCITE) or BuffPresent(BATTLETRANCE)
+ #/heroic_strike,if=(rage>85|buff.deadly_calm.up|buff.incite.up|buff.battle_trance.up)
+ if Mana(more 85) or BuffPresent(DEADLYCALM) or BuffPresent(INCITE) or BuffPresent(BATTLETRANCE)
Spell(HEROICSTRIKE)
}
diff --git a/defaut/Mage.lua b/defaut/Mage.lua
index da9d917..b4afb18 100644
--- a/defaut/Mage.lua
+++ b/defaut/Mage.lua
@@ -102,10 +102,10 @@ AddIcon help=main mastery=1
#/evocation,if=target.time_to_die>=31
if TargetDeadIn(more 31) Spell(EVOCATION)
#/sequence,name=conserve:arcane_blast:arcane_blast:arcane_blast:arcane_blast,if=!buff.bloodlust.up
- unless DebuffPresent(ARCANEBLASTDEBUFF stacks=4) or BuffPresent(heroism)
+ unless DebuffPresent(ARCANEBLASTDEBUFF stacks=4) or BuffPresent(heroism) or ManaPercent(less 26)
Spell(ARCANEBLAST)
if BuffPresent(ARCANEMISSILEBUFF) Spell(ARCANEMISSILES)
- #action_list_str += "/arcane_barrage,if=buff.arcane_blast.stack>0"; // when AM hasn't procced
+ #/arcane_barrage,if=buff.arcane_blast.stack>0; // when AM hasn't procced
Spell(ARCANEBARRAGE)
if Speed(more 0)
{
@@ -113,6 +113,7 @@ AddIcon help=main mastery=1
Spell(FIREBLAST)
Spell(ICELANCE)
}
+ Spell(ARCANEBLAST)
}
AddIcon help=cd mastery=1
@@ -120,25 +121,27 @@ AddIcon help=cd mastery=1
if TargetBuffStealable(yes) Spell(SPELLSTEAL)
if TargetIsInterruptible(yes) Spell(COUNTERSPELL)
- #/conjure_mana_gem,if=cooldown.evocation.remains<44&target.time_to_die<44&mana_gem_charges=0
- if ItemCount(MANAGEMITEM less 1 charges=1) and {spell(EVOCATION)<44} and TargetDeadIn(less 44)
+ #/conjure_mana_gem,if=cooldown.evocation.remains<44&target.time_to_die>20&mana_gem_charges=0
+ if ItemCount(MANAGEMITEM less 1 charges=1) and {spell(EVOCATION)<44} and TargetDeadIn(more 20)
Spell(CONJUREMANAGEM)
#if=(cooldown.evocation.remains<30&buff.arcane_blast.stack=4)|cooldown.evocation.remains>90|target.time_to_die<40
- if {{spell(EVOCATION)<30} and DebuffPresent(ARCANEBLAST stacks=4)} or {spell(EVOCATION)>90} or TargetDeadIn(less 40)
+ if {{spell(EVOCATION)<30} and DebuffPresent(ARCANEBLASTDEBUFF stacks=4)} or {spell(EVOCATION)>90} or TargetDeadIn(less 40)
{
Item(Trinket0Slot usable=1)
Item(Trinket1Slot usable=1)
#if ItemCount(VOLCANICPOTION more 0) Item(VOLCANICPOTION)
}
- if {{spell(EVOCATION)<30} and DebuffPresent(ARCANEBLAST stacks=4)} or TargetDeadIn(less 40)
+ if {{spell(EVOCATION)<30} and DebuffPresent(ARCANEBLASTDEBUFF stacks=4)} or TargetDeadIn(less 40)
{
#action_list_str += "/arcane_power,if=(cooldown.evocation.remains<30&buff.arcane_blast.stack=4)|target.time_to_die<40";
Spell(ARCANEPOWER)
#action_list_str += "/mana_gem,if=(cooldown.evocation.remains<30&buff.arcane_blast.stack=4)|target.time_to_die<40";
- Item(MANAGEMITEM)
+ if ManaPercent(less 85) Item(MANAGEMITEM)
}
+ if ManaPercent(less 10) Item(MANAGEMITEM)
+
#action_list_str += "/mirror_image,if=buff.arcane_power.up|(cooldown.arcane_power.remains>20&target.time_to_die>15)";
if BuffPresent(ARCANEPOWER) or {{spell(ARCANEPOWER)>0} and TargetDeadIn(more 15)} Spell(MIRRORIMAGE)
#/flame_orb,if=target.time_to_die>=10