Re-apply script fixes after latest SimulationCraft import.
Johnny C. Lam [03-02-13 - 18:08]
Re-apply script fixes after latest SimulationCraft import.
Rogue:
CP generators cause an extra CP if Shadow Blades is present.
Paladin:
When using the Glyph of Mass Exorcism, the spell ID of Exorcism
changes from 879 to 122032.
Warrior:
The spell ID generated by the SimC converter is incorrect. 46915 is
the spell ID of the passive ability while 46916 is the spell ID of the
actual buff gained by the warrior.
Also add a SpellInfo line that notes the duration of the Bloodsurge
buff.
This matches the usage of "bloodsurge" in the Ovale script which
checks for BuffStacks(bloodsurge), and which also has a SpellAddBuff
line for wild_strike that deducts one from Bloodsurge stack.
git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@713 d5049fe3-3747-40f7-a4b5-f36d6801af5f
diff --git a/defaut/Guerrier.lua b/defaut/Guerrier.lua
index c8f0f2d..44ac578 100644
--- a/defaut/Guerrier.lua
+++ b/defaut/Guerrier.lua
@@ -15,7 +15,8 @@ Define(bladestorm 46924)
Define(bloodbath 113344)
SpellInfo(bloodbath duration=6 tick=1 )
SpellAddTargetDebuff(bloodbath bloodbath=1)
-Define(bloodsurge 46915)
+Define(bloodsurge 46916)
+ SpellInfo(bloodsurge duration=10)
Define(bloodthirst 23881)
SpellInfo(bloodthirst rage=-10 cd=4.5 )
Define(cleave 845)
diff --git a/defaut/Paladin.lua b/defaut/Paladin.lua
index df706b7..4f5e562 100644
--- a/defaut/Paladin.lua
+++ b/defaut/Paladin.lua
@@ -14,6 +14,8 @@ Define(execution_sentence 114916)
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(guardian_of_ancient_kings 86659)
SpellInfo(guardian_of_ancient_kings duration=12 cd=180 )
SpellAddBuff(guardian_of_ancient_kings guardian_of_ancient_kings=1)
@@ -32,6 +34,7 @@ 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
{
@@ -47,7 +50,8 @@ AddIcon mastery=3 help=main
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)
- Spell(exorcism)
+ 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(crusader_strike)
Spell(judgment)
diff --git a/defaut/Voleur.lua b/defaut/Voleur.lua
index 9a5cc90..b3bc6b4 100644
--- a/defaut/Voleur.lua
+++ b/defaut/Voleur.lua
@@ -2,10 +2,10 @@ Ovale.defaut["ROGUE"] = [[Define(adrenaline_rush 13750)
SpellInfo(adrenaline_rush duration=15 cd=180 )
SpellAddBuff(adrenaline_rush adrenaline_rush=1)
Define(ambush 8676)
- SpellInfo(ambush energy=60 combo=2 )
+ SpellInfo(ambush energy=60 combo=2 buff_combo=shadow_blades )
Define(anticipation 114015)
Define(backstab 53)
- SpellInfo(backstab energy=35 combo=1 )
+ SpellInfo(backstab energy=35 combo=1 buff_combo=shadow_blades )
Define(bandits_guile 84654)
Define(berserking 26297)
SpellInfo(berserking duration=10 cd=180 )
@@ -14,20 +14,20 @@ Define(deep_insight 84747)
SpellInfo(deep_insight duration=15 )
SpellAddBuff(deep_insight deep_insight=1)
Define(dispatch 111240)
- SpellInfo(dispatch energy=30 combo=1 )
+ SpellInfo(dispatch energy=30 combo=1 buff_combo=shadow_blades )
Define(envenom 32645)
SpellInfo(envenom duration=1 combo=0 energy=35 )
SpellAddBuff(envenom envenom=1)
Define(eviscerate 2098)
SpellInfo(eviscerate combo=0 energy=35 )
Define(expose_armor 8647)
- SpellInfo(expose_armor energy=25 combo=1 )
+ SpellInfo(expose_armor energy=25 combo=1 buff_combo=shadow_blades )
AddCheckBox(expose_armor_check SpellName(expose_armor))
Define(find_weakness 91021)
SpellInfo(find_weakness duration=10 )
SpellAddBuff(find_weakness find_weakness=1)
Define(hemorrhage 16511)
- SpellInfo(hemorrhage energy=30 combo=1 )
+ 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 )
@@ -36,13 +36,13 @@ Define(killing_spree 51690)
SpellAddBuff(killing_spree killing_spree=1)
Define(master_of_subtlety 31223)
Define(mutilate 1329)
- SpellInfo(mutilate energy=55 combo=2 )
+ SpellInfo(mutilate energy=55 combo=2 buff_combo=shadow_blades )
Define(premeditation 14183)
SpellInfo(premeditation duration=18 combo=2 cd=20 )
Define(preparation 14185)
SpellInfo(preparation cd=300 )
Define(revealing_strike 84617)
- SpellInfo(revealing_strike duration=18 energy=40 combo=1 )
+ SpellInfo(revealing_strike duration=18 energy=40 combo=1 buff_combo=shadow_blades )
SpellAddTargetDebuff(revealing_strike revealing_strike=1)
Define(rupture 1943)
SpellInfo(rupture duration=4 combo=0 energy=25 )
@@ -54,7 +54,7 @@ Define(shadow_dance 51713)
SpellInfo(shadow_dance duration=8 cd=60 )
SpellAddBuff(shadow_dance shadow_dance=1)
Define(sinister_strike 1752)
- SpellInfo(sinister_strike energy=40 combo=1 )
+ SpellInfo(sinister_strike energy=40 combo=1 buff_combo=shadow_blades )
Define(slice_and_dice 5171)
SpellInfo(slice_and_dice duration=6 combo=0 energy=25 )
SpellAddBuff(slice_and_dice slice_and_dice=1)