some scripts updates

diff --git a/defaut/Chasseur.lua b/defaut/Chasseur.lua
index 00fc2ca..d74ba1d 100644
--- a/defaut/Chasseur.lua
+++ b/defaut/Chasseur.lua
@@ -108,9 +108,13 @@ AddIcon mastery=1 help=main
 }
 AddIcon mastery=1 help=offgcd
 {
+	if not InCombat()
+	{
+		unless Stance(1) Spell(aspect_of_the_hawk)
+	}
 	unless Stance(1) Spell(aspect_of_the_hawk)
 	if Focus() >60 and not BuffPresent(beast_within) Spell(bestial_wrath)
-	if BuffPresent(rapid_fire) or BuffStacks(bloodlust any=1) Spell(stampede)
+	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)
 	if SpellUsable(lynx_rush) and not target.DebuffPresent(lynx_rush) Spell(lynx_rush)
@@ -161,9 +165,13 @@ AddIcon mastery=2 help=main
 }
 AddIcon mastery=2 help=offgcd
 {
+	if not InCombat()
+	{
+		unless Stance(1) Spell(aspect_of_the_hawk)
+	}
 	unless Stance(1) Spell(aspect_of_the_hawk)
 	if SpellUsable(lynx_rush) and not target.DebuffPresent(lynx_rush) Spell(lynx_rush)
-	if BuffPresent(rapid_fire) or BuffStacks(bloodlust any=1) Spell(stampede)
+	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)
 }
@@ -208,11 +216,15 @@ AddIcon mastery=3 help=main
 }
 AddIcon mastery=3 help=offgcd
 {
+	if not InCombat()
+	{
+		unless Stance(1) Spell(aspect_of_the_hawk)
+	}
 	unless Stance(1) Spell(aspect_of_the_hawk)
 	if SpellUsable(a_murder_of_crows) and not target.DebuffPresent(a_murder_of_crows) Spell(a_murder_of_crows)
 	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) Spell(stampede)
+	if BuffPresent(rapid_fire) or BuffStacks(bloodlust any=1) or target.DeadIn() <=25 Spell(stampede)
 }
 AddIcon mastery=3 help=aoe
 {
diff --git a/defaut/Druide.lua b/defaut/Druide.lua
index 12cf20c..0af0cbd 100644
--- a/defaut/Druide.lua
+++ b/defaut/Druide.lua
@@ -97,6 +97,7 @@ Define(wild_mushroom_detonate 78777)
 Define(wrath 5176)
 Define(dream_of_cenarius_talent 17)
 Define(force_of_nature_talent 12)
+Define(heart_of_the_wild_talent 16)
 Define(incarnation_talent 11)
 Define(natures_swiftness_talent 4)
 Define(natures_vigil_talent 18)
diff --git a/defaut/Guerrier.lua b/defaut/Guerrier.lua
index 8c6ea27..e6c2ee7 100644
--- a/defaut/Guerrier.lua
+++ b/defaut/Guerrier.lua
@@ -105,7 +105,9 @@ Define(taste_for_blood 56638)
 Define(thunder_clap 6343)
   SpellInfo(thunder_clap rage=20 cd=6 )
   SpellAddTargetDebuff(thunder_clap weakened_blows=1)
-Define(ultimatum 122509)
+Define(ultimatum 122510)
+  SpellInfo(ultimatum duration=10 )
+  SpellAddBuff(ultimatum ultimatum=1)
 Define(weakened_armor 113746)
   SpellInfo(weakened_armor duration=30 )
   SpellAddBuff(weakened_armor weakened_armor=1)
@@ -231,9 +233,9 @@ AddIcon mastery=3 help=main
 	{
 		unless Stance(2) Spell(defensive_stance)
 	}
-	if Rage() <90 Spell(shield_slam)
-	if Rage() <100 Spell(revenge)
-	if Rage() <100 Spell(battle_shout)
+	if Rage() <80 Spell(shield_slam)
+	if Rage() <85 Spell(revenge)
+	if Rage() <90 Spell(battle_shout)
 	if target.DebuffExpires(weakened_blows) Spell(thunder_clap)
 	if target.HealthPercent(less 20) Spell(execute)
 	Spell(devastate)
@@ -241,8 +243,8 @@ AddIcon mastery=3 help=main
 AddIcon mastery=3 help=offgcd
 {
 	if target.IsInterruptible() Spell(pummel)
-	Spell(berserker_rage)
 	if BuffPresent(ultimatum) 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)
 	Spell(demoralizing_shout)
diff --git a/defaut/Mage.lua b/defaut/Mage.lua
index 1869cfb..62dfb16 100644
--- a/defaut/Mage.lua
+++ b/defaut/Mage.lua
@@ -69,6 +69,9 @@ Define(ignite 12654)
 Define(inferno_blast 108853)
   SpellInfo(inferno_blast cd=8 )
 Define(invocation 114003)
+Define(living_bomb 44457)
+  SpellInfo(living_bomb duration=12 tick=3 )
+  SpellAddTargetDebuff(living_bomb living_bomb=1)
 Define(mage_armor 6117)
   SpellAddBuff(mage_armor mage_armor=1)
 Define(mana_gem 56597)
@@ -77,9 +80,6 @@ Define(mirror_image 55342)
   SpellAddBuff(mirror_image mirror_image=1)
 Define(molten_armor 30482)
   SpellAddBuff(molten_armor molten_armor=1)
-Define(nether_tempest 114923)
-  SpellInfo(nether_tempest duration=12 tick=1 )
-  SpellAddTargetDebuff(nether_tempest nether_tempest=1)
 Define(presence_of_mind 12043)
   SpellInfo(presence_of_mind cd=90 )
   SpellAddBuff(presence_of_mind presence_of_mind=1)
@@ -110,7 +110,7 @@ AddIcon mastery=1 help=main
 	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 {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 Spell(arcane_blast)
 	if BuffStacks(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)
@@ -151,7 +151,7 @@ AddIcon mastery=2 help=main
 	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 BuffStacks(heating_up) and BuffExpires(pyroblast_aura) Spell(inferno_blast)
-	if not target.DebuffPresent(nether_tempest) Spell(nether_tempest)
+	if {not target.DebuffPresent(living_bomb) or target.DebuffRemains(living_bomb) <TickTime(living_bomb) } and target.DeadIn() >TickTime(living_bomb) *3 Spell(living_bomb)
 	Spell(fireball)
 }
 AddIcon mastery=2 help=offgcd
@@ -194,13 +194,12 @@ AddIcon mastery=3 help=main
 	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 BuffStacks(fingers_of_frost_aura) and BuffRemains(fingers_of_frost_aura) <5 Spell(ice_lance)
 	if target.DeadIn() >=4 and BuffStacks(fingers_of_frost_aura) <2 and SpellCooldown(icy_veins) <GCD() and BuffRemains(invocation) >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 target.DebuffStacks(frostbolt) <3 Spell(frostbolt)
-	if BuffStacks(brain_freeze) and {BuffPresent(alter_time) or SpellCooldown(alter_time_activate) >4 } Spell(frostfire_bolt)
-	if BuffStacks(fingers_of_frost_aura) and {BuffPresent(alter_time) or SpellCooldown(alter_time_activate) >4 } Spell(ice_lance)
 	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)
 	Spell(frostbolt)
 }
@@ -214,9 +213,9 @@ AddIcon mastery=3 help=offgcd
 	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) Spell(frost_bomb)
-	if BuffExpires(alter_time) and BuffStacks(brain_freeze) and BuffStacks(fingers_of_frost_aura) and BuffRemains(invocation) >6 Spell(alter_time)
-	if BuffExpires(alter_time) and BuffStacks(brain_freeze) and BuffStacks(fingers_of_frost_aura) Spell(alter_time)
+	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(invocation) >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)
 }
 AddIcon mastery=3 help=moving
diff --git a/defaut/Moine.lua b/defaut/Moine.lua
index 9a4f735..cda9ed9 100644
--- a/defaut/Moine.lua
+++ b/defaut/Moine.lua
@@ -73,7 +73,7 @@ AddIcon mastery=3 help=main
 AddIcon mastery=3 help=offgcd
 {
 	if TalentPoints(power_strikes_talent) and BuffStacks(chi_sphere) and Chi() <4 Spell(chi_sphere)
-	if not BuffPresent(tigereye_brew_use) and BuffStacks(tigereye_brew) ==10 Spell(tigereye_brew_use)
+	if not BuffPresent(tigereye_brew_use) and BuffStacks(tigereye_brew) ==10 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 8e92e2b..df706b7 100644
--- a/defaut/Paladin.lua
+++ b/defaut/Paladin.lua
@@ -56,12 +56,12 @@ AddIcon mastery=3 help=main
 AddIcon mastery=3 help=offgcd
 {
 	if target.IsInterruptible() Spell(rebuke)
-	if BuffPresent(inquisition) and TimeInCombat() >10 Spell(execution_sentence)
+	if BuffPresent(inquisition) Spell(execution_sentence)
 }
 AddIcon mastery=3 help=cd
 {
 	if BuffPresent(inquisition) Spell(avenging_wrath)
 	if BuffPresent(avenging_wrath) Spell(guardian_of_ancient_kings)
-	if BuffPresent(inquisition) and TimeInCombat() >10  { Item(Trinket0Slot usable=1) Item(Trinket1Slot usable=1) }
+	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 e5b19f9..f9e5faf 100644
--- a/defaut/Pretre.lua
+++ b/defaut/Pretre.lua
@@ -1,6 +1,8 @@
 Ovale.defaut["PRIEST"] = [[Define(berserking 26297)
   SpellInfo(berserking duration=10 cd=180 )
   SpellAddBuff(berserking berserking=1)
+Define(cascade 120785)
+  SpellInfo(cascade duration=0.1 )
 Define(devouring_plague 2944)
   SpellInfo(devouring_plague duration=6 shadoworbs=1 )
   SpellAddTargetDebuff(devouring_plague devouring_plague=1)
@@ -10,8 +12,9 @@ Define(dispersion 47585)
 Define(divine_insight_shadow 124430)
   SpellInfo(divine_insight_shadow duration=12 )
   SpellAddBuff(divine_insight_shadow divine_insight_shadow=1)
-Define(halo_damage 120517)
-  SpellInfo(halo_damage duration=5.5 cd=40 )
+Define(divine_star 110745)
+Define(halo 120644)
+  SpellInfo(halo duration=5.5 cd=40 )
 Define(inner_fire 588)
   SpellAddBuff(inner_fire inner_fire=1)
 Define(inner_will 73413)
@@ -25,11 +28,17 @@ Define(mind_sear 48045)
   SpellInfo(mind_sear duration=5 canStopChannelling=1 )
   SpellAddBuff(mind_sear mind_sear=1)
 Define(mind_spike 73510)
+Define(mindbender 123040)
+  SpellInfo(mindbender duration=15 cd=60 )
+Define(power_infusion 10060)
+  SpellInfo(power_infusion duration=20 cd=120 )
+  SpellAddBuff(power_infusion power_infusion=1)
 Define(power_word_fortitude 21562)
   SpellInfo(power_word_fortitude duration=3600 )
   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)
@@ -40,9 +49,18 @@ Define(shadowform 15473)
 Define(surge_of_darkness 87160)
   SpellInfo(surge_of_darkness duration=10 )
   SpellAddBuff(surge_of_darkness surge_of_darkness=1)
+Define(vampiric_embrace 15286)
+  SpellInfo(vampiric_embrace duration=15 cd=180 )
+  SpellAddBuff(vampiric_embrace vampiric_embrace=1)
 Define(vampiric_touch 34914)
   SpellInfo(vampiric_touch duration=15 )
   SpellAddTargetDebuff(vampiric_touch vampiric_touch=1)
+Define(cascade_talent 16)
+Define(divine_star_talent 17)
+Define(halo_talent 18)
+Define(mindbender_talent 8)
+Define(power_infusion_talent 14)
+Define(power_word_solace_talent 9)
 AddIcon mastery=3 help=main
 {
 	if not InCombat()
@@ -53,15 +71,22 @@ AddIcon mastery=3 help=main
 	}
 	if BuffExpires(shadowform) Spell(shadowform)
 	if ShadowOrbs() ==3 and {SpellCooldown(mind_blast) <2 or target.HealthPercent() <20 } Spell(devouring_plague)
+	if TalentPoints(power_word_solace_talent) Spell(shadow_word_insanity)
 	if SpellCooldown(mind_blast) Spell(mind_blast)
 	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 TalentPoints(halo_talent) Spell(halo)
 	if BuffStacks(surge_of_darkness) Spell(mind_spike)
+	if TalentPoints(cascade_talent) Spell(cascade)
+	if TalentPoints(mindbender_talent) Spell(mindbender)
 	Spell(mind_flay)
 }
+AddIcon mastery=3 help=offgcd
+{
+	if TalentPoints(divine_star_talent) Spell(divine_star)
+}
 AddIcon mastery=3 help=moving
 {
 	if target.HealthPercent(less 20) Spell(shadow_word_death)
@@ -76,7 +101,9 @@ AddIcon mastery=3 help=cd
 {
 	 { Item(Trinket0Slot usable=1) Item(Trinket1Slot usable=1) }
 	Spell(berserking)
-	if SpellCooldown(shadowfiend) Spell(shadowfiend)
+	if TalentPoints(power_infusion_talent) Spell(power_infusion)
+	if ShadowOrbs() ==3 and Health() <=40 Spell(vampiric_embrace)
+	if not TalentPoints(mindbender_talent) Spell(shadowfiend)
 	Spell(dispersion)
 }
 ]]
\ No newline at end of file