- added the nodeath option to Rune()
Sidoine De Wispelaere [10-05-09 - 22:25]
- added the nodeath option to Rune()
- fixed blood and frost script, should be slighty better
- added some abilities to warrior tanking script
git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@110 d5049fe3-3747-40f7-a4b5-f36d6801af5f
diff --git a/Condition.lua b/Condition.lua
index 9c38b9c..5fb706e 100644
--- a/Condition.lua
+++ b/Condition.lua
@@ -448,7 +448,7 @@ Ovale.conditions=
local minCD = nil
for i=1,6 do
local rune = Ovale.state.rune[i]
- if (rune.type == type or rune.type == 4) then
+ if rune.type == type or (rune.type == 4 and not condition.nodeath) then
if (rune.cd == 0) then
nombre = nombre + 1
else
diff --git a/Ovale.toc b/Ovale.toc
index 9e83c6c..c46746f 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: 3.2.7
+## Version: 3.2.8
## OptionalDeps: Ace3, ButtonFacade, Recount
## SavedVariables: OvaleDB
## SavedVariablesPerCharacter: OvaleDBPC
diff --git a/defaut/Chevalier.lua b/defaut/Chevalier.lua
index 883a96b..846ff96 100644
--- a/defaut/Chevalier.lua
+++ b/defaut/Chevalier.lua
@@ -28,6 +28,7 @@ Define(FROSTSTRIKE 49143)
Define(HYSTERIA 49016)
Define(SUMMONGARGOYLE 49206)
Define(GLYPHDISEASE 63959)
+Define(GLYPHHOWLINGBLAST 63961)
Define(ABOMINATIONMIGHT 53136)
Define(TALENTABOMINATIONMIGHT 2105)
Define(RAISEDEAD 46584)
@@ -49,7 +50,12 @@ ScoreSpells(HOWLINGBLAST HEARTSTRIKE BLOODSTRIKE DEATHSTRIKE SCOURGESTRIKE OBLIT
AddIcon
{
- if Runes(unholy 1) and Runes(frost 1) Spell(HOWLINGBLAST)
+ Spell(DANCINGRUNEWEAPON usable=1)
+
+ if CheckBoxOn(rolldes) and Glyph(GLYPHDISEASE) and TargetDebuffExpires(FROSTFEVER 2 mine=1) and TargetDebuffPresent(FROSTFEVER mine=1) and
+ TargetDebuffExpires(BLOODPLAGUE 2 mine=1) and TargetDebuffPresent(BLOODPLAGUE mine=1)
+ Spell(PESTILENCE)
+
if TargetDebuffPresent(FROSTFEVER mine=1) and TargetDebuffPresent(BLOODPLAGUE mine=1)
{
if TalentPoints(TALENTBLOODYSTRIKES more 0)
@@ -60,7 +66,7 @@ AddIcon
Spell(BLOODSTRIKE)
}
}
- if Runes(unholy 1) and Runes(frost 1)
+ if Runes(unholy 1 nodeath=1) and Runes(frost 1 nodeath=1)
{
if TalentPoints(TALENTDEATSTRIKE more 0) Spell(DEATHSTRIKE)
Spell(SCOURGESTRIKE)
@@ -73,25 +79,27 @@ AddIcon
Spell(BLOODSTRIKE)
}
}
- if CheckBoxOn(rolldes) and Glyph(GLYPHDISEASE) and TargetDebuffExpires(FROSTFEVER 2 mine=1) and TargetDebuffPresent(FROSTFEVER mine=1) and
- TargetDebuffExpires(BLOODPLAGUE 2 mine=1) and TargetDebuffPresent(BLOODPLAGUE mine=1)
- Spell(PESTILENCE)
-
+
if CheckBoxOn(rolldes) and TalentPoints(TALENTABOMINATIONMIGHT more 0) and BuffPresent(ABOMINATIONMIGHT no)
Spell(DEATHSTRIKE)
+
if TargetDebuffExpires(FROSTFEVER 0 mine=1) and Runes(frost 1)
+ {
+ if Glyph(GLYPHHOWLINGBLAST) Spell(HOWLINGBLAST)
Spell(ICYTOUCH)
+ }
+
if TargetDebuffExpires(BLOODPLAGUE 0 mine=1) and Runes(unholy 1)
Spell(PLAGUESTRIKE)
Spell(FROSTSTRIKE usable=1)
- Spell(DEATHCOIL usable=1)
-
if PetPresent(no) Spell(RAISEDEAD)
+ Spell(DEATHCOIL usable=1)
}
AddIcon
{
+ if Runes(unholy 1) and Runes(frost 1) Spell(HOWLINGBLAST)
if TargetDebuffPresent(BLOODPLAGUE) or TargetDebuffPresent(FROSTFEVER)
Spell(PESTILENCE usable=1)
Spell(DEATHANDECAY usable=1)
@@ -118,7 +126,6 @@ AddIcon size=small
{
Spell(SUMMONGARGOYLE)
Spell(HYSTERIA)
- Spell(DANCINGRUNEWEAPON)
}
Item(Trinket0Slot usable=1)
Item(Trinket1Slot usable=1)
diff --git a/defaut/Guerrier.lua b/defaut/Guerrier.lua
index 51900e1..6937e53 100644
--- a/defaut/Guerrier.lua
+++ b/defaut/Guerrier.lua
@@ -73,9 +73,13 @@ AddIcon
if Stance(2) #Defense
{
- if TargetClassification(worldboss)
- and TargetDebuffExpires(THUNDERCLAP 2)
- Spell(THUNDERCLAP)
+ if TargetClassification(worldboss)
+ {
+ if TargetDebuffExpires(THUNDERCLAP 2)
+ Spell(THUNDERCLAP)
+ Spell(CONCUSSIONBLOW)
+ Spell(SHOCKWAVE)
+ }
if CheckBoxOn(multi)
{